]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: configure must not affect tarball contents
authorEric Blake <eblake@redhat.com>
Mon, 1 Jul 2013 22:48:11 +0000 (16:48 -0600)
committerEric Blake <eblake@redhat.com>
Mon, 29 Jul 2013 22:13:44 +0000 (16:13 -0600)
On mingw, configure sets the name of the lxc symfile to
libvirt_lxc.defs rather than libvirt_lxc.syms.  But tarballs
must be arch-independent, regardless of the configure options
used for the tree where we ran 'make dist'.  This led to the
following failure in autobuild.sh:

  CCLD     libvirt-lxc.la
  CCLD     libvirt-qemu.la
/usr/lib64/gcc/i686-w64-mingw32/4.7.2/../../../../i686-w64-mingw32/bin/ld: cannot find libvirt_lxc.def: No such file or directory
collect2: error: ld returned 1 exit status
make[3]: *** [libvirt-lxc.la] Error 1
make[3]: *** Waiting for unfinished jobs....

We were already doing the right thing with libvirt_qemu.syms.

* src/Makefile.am (EXTRA_DIST): Don't ship a built file which
depends on configure for its final name.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit d79c9273b0724dfd39eaf13bef2953fcea5b8fa4)

src/Makefile.am

index 6fb980a91859ee2a36768ecfc46db144449d8f0e..dca018712eea54a117825bef78c540048bdbe483 100644 (file)
@@ -1701,7 +1701,6 @@ libvirt_lxc_la_LDFLAGS = \
                $(NULL)
 libvirt_lxc_la_CFLAGS = $(AM_CFLAGS)
 libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
-EXTRA_DIST += $(LIBVIRT_LXC_SYMBOL_FILE)
 
 lockdriverdir = $(libdir)/libvirt/lock-driver
 lockdriver_LTLIBRARIES =