[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] another tarball tweak



I tried sending this twice yesterday, but either it's stuck in some long
queue, or got eaten along the way by an overactive spam filter, as it
hasn't seemed to hit the list yet.  Hopefully by sending by hand instead
of my normal 'git send-email', I can see it get through.

I'll push this under the build-breaker rule (yes, it's a bit of a
stretch, since extra files don't really hurt, but I want to avoid the
situation of a tarball being generated differently merely because of
different configure options).

From daa886b635e4a4f46782c8ac6274de1623e12f67 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake redhat com>
Date: Wed, 9 Jan 2013 15:07:30 -0700
Subject: [PATCH] maint: don't distribute generated .def files

I ran 'make dist' in the directory left over from ./autobuild.sh
(which was configured for a mingw cross build); the resulting
tarball had more files than 'make dist' on a normal Linux build.
I traced it to the fact that we were distributing a generated
file, but only when configure said the end user had to generate
the file in the first place.  In the process, I noticed that
we had some difference in symbol file names; I added a comment
explaining why the difference exists (after first trying to
normalize the names and hitting VPATH build failures).

* configure.ac (LIBVIRT_QEMU_SYMBOL_FILE): Add some comments.
* src/Makefile.am (EXTRA_DIST): No need to ship a generated file;
particularly since which file is built depends on configure results.
---
 configure.ac    | 2 ++
 src/Makefile.am | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5acba9b..dd28401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2676,6 +2676,8 @@ CYGWIN_EXTRA_LIBADD=
 CYGWIN_EXTRA_PYTHON_LIBADD=
 MINGW_EXTRA_LDFLAGS=
 WIN32_EXTRA_CFLAGS=
+dnl libvirt.syms is generated in builddir, but libvirt_qemu.syms is in git;
+dnl hence the asymmetric naming of these two symbol files.
 LIBVIRT_SYMBOL_FILE=libvirt.syms
 LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms'
 MSCOM_LIBS=
diff --git a/src/Makefile.am b/src/Makefile.am
index da571c7..8a4731b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1564,7 +1564,6 @@ libvirt_qemu_la_LDFLAGS =
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \
 			  $(AM_LDFLAGS)
 libvirt_qemu_la_CFLAGS = $(AM_CFLAGS)
 libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
-EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)

 lockdriverdir = $(libdir)/libvirt/lock-driver
 lockdriver_LTLIBRARIES =
-- 
1.8.0.2


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]