提交 91ffb42c 编写于 作者: E Eric Blake

maint: check all symfiles for sorting

On FreeBSD, I got a 'make check' failure:
  GEN    check-symsorting
Symbol block at ./libvirt_atomic.syms:4: viratomic.h not found

* src/Makefile.am (SYM_FILES): New define.
(check-symsorting): Check on all symfiles, even when not used.
* src/libvirt_atomic.syms: Fix offender.
上级 492afb82
...@@ -389,7 +389,7 @@ check-symfile: ...@@ -389,7 +389,7 @@ check-symfile:
endif endif
check-symsorting: check-symsorting:
$(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \
$(srcdir) $(USED_SYM_FILES) $(srcdir) $(SYM_FILES)
EXTRA_DIST += check-symfile.pl check-symsorting.pl EXTRA_DIST += check-symfile.pl check-symsorting.pl
PROTOCOL_STRUCTS = \ PROTOCOL_STRUCTS = \
...@@ -809,6 +809,7 @@ libvirt_driver_la_CFLAGS = \ ...@@ -809,6 +809,7 @@ libvirt_driver_la_CFLAGS = \
libvirt_driver_la_LIBADD = \ libvirt_driver_la_LIBADD = \
$(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS)
SYM_FILES = $(USED_SYM_FILES)
USED_SYM_FILES = $(srcdir)/libvirt_private.syms USED_SYM_FILES = $(srcdir)/libvirt_private.syms
if WITH_TEST if WITH_TEST
...@@ -1410,42 +1411,62 @@ check-augeas-lockd: test_libvirt_lockd.aug ...@@ -1410,42 +1411,62 @@ check-augeas-lockd: test_libvirt_lockd.aug
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES
USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
else
SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
endif endif
if WITH_LINUX if WITH_LINUX
USED_SYM_FILES += $(srcdir)/libvirt_linux.syms USED_SYM_FILES += $(srcdir)/libvirt_linux.syms
else
SYM_FILES += $(srcdir)/libvirt_linux.syms
endif endif
if WITH_ESX if WITH_ESX
USED_SYM_FILES += $(srcdir)/libvirt_esx.syms USED_SYM_FILES += $(srcdir)/libvirt_esx.syms
else
SYM_FILES += $(srcdir)/libvirt_esx.syms
endif endif
if WITH_LIBVIRTD if WITH_LIBVIRTD
USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms
else
SYM_FILES += $(srcdir)/libvirt_daemon.syms
endif endif
if WITH_OPENVZ if WITH_OPENVZ
USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
else
SYM_FILES += $(srcdir)/libvirt_openvz.syms
endif endif
if WITH_VMX if WITH_VMX
USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
else
SYM_FILES += $(srcdir)/libvirt_vmx.syms
endif endif
if WITH_XENXS if WITH_XENXS
USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms
else
SYM_FILES += $(srcdir)/libvirt_xenxs.syms
endif endif
if WITH_SASL if WITH_SASL
USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
else
SYM_FILES += $(srcdir)/libvirt_sasl.syms
endif endif
if WITH_SSH2 if WITH_SSH2
USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms
else
SYM_FILES += $(srcdir)/libvirt_libssh2.syms
endif endif
if WITH_ATOMIC_OPS_PTHREAD if WITH_ATOMIC_OPS_PTHREAD
USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms
else
SYM_FILES += $(srcdir)/libvirt_atomic.syms
endif endif
EXTRA_DIST += \ EXTRA_DIST += \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# These symbols are dependent upon !VIR_ATOMIC_OPS_GCC. # These symbols are dependent upon !VIR_ATOMIC_OPS_GCC.
# #
# viratomic.h # util/viratomic.h
virAtomicLock; virAtomicLock;
# Let emacs know we want case-insensitive sorting # Let emacs know we want case-insensitive sorting
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册