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. --- Pushing under the build-breaker rule. src/Makefile.am | 23 ++++++++++++++++++++++- src/libvirt_atomic.syms | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3ef9a9c..c1659a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -389,7 +389,7 @@ check-symfile: endif check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ - $(srcdir) $(USED_SYM_FILES) + $(srcdir) $(SYM_FILES) EXTRA_DIST += check-symfile.pl check-symsorting.pl PROTOCOL_STRUCTS = \ @@ -809,6 +809,7 @@ libvirt_driver_la_CFLAGS = \ libvirt_driver_la_LIBADD = \ $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) +SYM_FILES = $(USED_SYM_FILES) USED_SYM_FILES = $(srcdir)/libvirt_private.syms if WITH_TEST @@ -1410,42 +1411,62 @@ check-augeas-lockd: test_libvirt_lockd.aug if WITH_DRIVER_MODULES USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms +else +SYM_FILES += $(srcdir)/libvirt_driver_modules.syms endif if WITH_LINUX USED_SYM_FILES += $(srcdir)/libvirt_linux.syms +else +SYM_FILES += $(srcdir)/libvirt_linux.syms endif if WITH_ESX USED_SYM_FILES += $(srcdir)/libvirt_esx.syms +else +SYM_FILES += $(srcdir)/libvirt_esx.syms endif if WITH_LIBVIRTD USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms +else +SYM_FILES += $(srcdir)/libvirt_daemon.syms endif if WITH_OPENVZ USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms +else +SYM_FILES += $(srcdir)/libvirt_openvz.syms endif if WITH_VMX USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms +else +SYM_FILES += $(srcdir)/libvirt_vmx.syms endif if WITH_XENXS USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms +else +SYM_FILES += $(srcdir)/libvirt_xenxs.syms endif if WITH_SASL USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms +else +SYM_FILES += $(srcdir)/libvirt_sasl.syms endif if WITH_SSH2 USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms +else +SYM_FILES += $(srcdir)/libvirt_libssh2.syms endif if WITH_ATOMIC_OPS_PTHREAD USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms +else +SYM_FILES += $(srcdir)/libvirt_atomic.syms endif EXTRA_DIST += \ diff --git a/src/libvirt_atomic.syms b/src/libvirt_atomic.syms index db80ce8..e2c2363 100644 --- a/src/libvirt_atomic.syms +++ b/src/libvirt_atomic.syms @@ -2,7 +2,7 @@ # These symbols are dependent upon !VIR_ATOMIC_OPS_GCC. # -# viratomic.h +# util/viratomic.h virAtomicLock; # Let emacs know we want case-insensitive sorting -- 1.8.1.2