[libvirt] [PATCH] build: always include libvirt_lxc.syms in tarball
On a mingw build, 'make distcheck' fails with: GEN libvirt_qemu.def make[3]: *** No rule to make target `../../src/libvirt_lxc.syms', needed by `libvirt_lxc.def'. Stop. I traced it to a missing entry in EXTRA_DIST. But rather than keep the entire list in sync, it is easier to list the three syms files that drive .so files directly, and then reuse existing makefile variables for the remaining files (that is, I validated that all remaining files are added to SYM_FILES, possibly via USED_SYM_FILES, according to makefile conditionals). * src/Makefile.am (EXTRA_DIST): Ensure all syms files are shipped. Signed-off-by: Eric Blake <eblake@redhat.com> --- src/Makefile.am | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 299b8fd..6c2788c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1548,20 +1548,11 @@ SYM_FILES += $(srcdir)/libvirt_atomic.syms endif EXTRA_DIST += \ - libvirt_public.syms \ - libvirt_private.syms \ - libvirt_atomic.syms \ - libvirt_driver_modules.syms \ - libvirt_daemon.syms \ - libvirt_linux.syms \ - libvirt_esx.syms \ - libvirt_openvz.syms \ - libvirt_qemu.syms \ - libvirt_sasl.syms \ - libvirt_gnutls.syms \ - libvirt_vmx.syms \ - libvirt_xenxs.syms \ - libvirt_libssh2.syms + libvirt_public.syms \ + libvirt_lxc.syms \ + libvirt_qemu.syms \ + $(SYM_FILES) \ + $(NULL) GENERATED_SYM_FILES = \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def -- 1.8.1.4
On 05/02/2013 05:50 PM, Eric Blake wrote:
On a mingw build, 'make distcheck' fails with:
GEN libvirt_qemu.def make[3]: *** No rule to make target `../../src/libvirt_lxc.syms', needed by `libvirt_lxc.def'. Stop.
I traced it to a missing entry in EXTRA_DIST. But rather than keep the entire list in sync, it is easier to list the three syms files that drive .so files directly, and then reuse existing makefile variables for the remaining files (that is, I validated that all remaining files are added to SYM_FILES, possibly via USED_SYM_FILES, according to makefile conditionals).
Hmm, even after fixing that, I still see a failure in 'make distcheck': ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log I'll have to chase that down later, unless someone beats me to it. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
'make distcheck' complained: ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log * tests/commandtest.c (test16): Unlink log file. * python/Makefile.am (CLEANFILES): Clean up compiled python files. Signed-off-by: Eric Blake <eblake@redhat.com> --- python/Makefile.am | 3 ++- tests/commanddata/test21.log | 12 ++++++++++++ tests/commandtest.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tests/commanddata/test21.log diff --git a/python/Makefile.am b/python/Makefile.am index ba444ef..767d807 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -142,7 +142,8 @@ uninstall-local: rm -f $(DESTDIR)$(pyexecdir)/libvirt_lxc.py rm -f $(DESTDIR)$(pyexecdir)/libvirt_qemu.py -CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp +CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp \ + *.pyc else all: diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log new file mode 100644 index 0000000..1b59206 --- /dev/null +++ b/tests/commanddata/test21.log @@ -0,0 +1,12 @@ +ENV:DISPLAY=:0.0 +ENV:HOME=/home/test +ENV:HOSTNAME=test +ENV:LANG=C +ENV:LOGNAME=testTMPDIR=/tmp +ENV:PATH=/usr/bin:/bin +ENV:USER=test +FD:0 +FD:1 +FD:2 +DAEMON:no +CWD:/tmp diff --git a/tests/commandtest.c b/tests/commandtest.c index 6cb88c5..68398ac 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -891,7 +891,7 @@ static int test21(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } - ret = 0; + ret = checkoutput("test21"); cleanup: VIR_FREE(outbuf); VIR_FREE(errbuf); -- 1.8.1.4
On 05/06/2013 11:15 AM, Eric Blake wrote:
'make distcheck' complained:
ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log
* tests/commandtest.c (test16): Unlink log file.
Stale commit message buffer. The correct commit message is: build: clean up stray files found by 'make distcheck' 'make distcheck' complained: ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log * tests/commandtest.c (test21): Check (and clean) log file. * tests/commanddata/test21.log: New file. * python/Makefile.am (CLEANFILES): Clean up compiled python files. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 05/06/13 19:39, Eric Blake wrote:
On 05/06/2013 11:15 AM, Eric Blake wrote:
'make distcheck' complained:
ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log
* tests/commandtest.c (test16): Unlink log file.
Stale commit message buffer. The correct commit message is:
build: clean up stray files found by 'make distcheck'
'make distcheck' complained:
ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log
* tests/commandtest.c (test21): Check (and clean) log file. * tests/commanddata/test21.log: New file. * python/Makefile.am (CLEANFILES): Clean up compiled python files.
ACK, I've hit the error when trying the previous patch. This fixes it. Peter
On 05/06/2013 01:22 PM, Peter Krempa wrote:
On 05/06/13 19:39, Eric Blake wrote:
On 05/06/2013 11:15 AM, Eric Blake wrote:
'make distcheck' complained:
ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log
* tests/commandtest.c (test16): Unlink log file.
Stale commit message buffer. The correct commit message is:
build: clean up stray files found by 'make distcheck'
'make distcheck' complained:
ERROR: files left in build directory after distclean: ./python/libvirt.pyc ./tests/commandhelper.log
* tests/commandtest.c (test21): Check (and clean) log file. * tests/commanddata/test21.log: New file. * python/Makefile.am (CLEANFILES): Clean up compiled python files.
ACK, I've hit the error when trying the previous patch. This fixes it.
Thanks; these are now both pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 05/03/13 01:50, Eric Blake wrote:
On a mingw build, 'make distcheck' fails with:
GEN libvirt_qemu.def make[3]: *** No rule to make target `../../src/libvirt_lxc.syms', needed by `libvirt_lxc.def'. Stop.
I traced it to a missing entry in EXTRA_DIST. But rather than keep the entire list in sync, it is easier to list the three syms files that drive .so files directly, and then reuse existing makefile variables for the remaining files (that is, I validated that all remaining files are added to SYM_FILES, possibly via USED_SYM_FILES, according to makefile conditionals).
I checked them too.
* src/Makefile.am (EXTRA_DIST): Ensure all syms files are shipped.
Signed-off-by: Eric Blake <eblake@redhat.com>
ACK, the build is fine with this patch.
--- src/Makefile.am | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
Peter
participants (2)
-
Eric Blake -
Peter Krempa