[Pkg-libvirt-commits] [libvirt] 01/01: Parse AM_LDFLAGS to driver modules too

Guido Guenther agx at alioth.debian.org
Sun Sep 1 09:28:50 UTC 2013 

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch experimental
in repository libvirt.

commit 1fb0a76c67fda6b7ac8d849099e2bbda8357b581
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Sep 1 08:49:30 2013 +0200

    Parse AM_LDFLAGS to driver modules too
    
    got get a RO got
    
    Thanks: again lintian and lintian-maintainers!
---
 .../Parse-AM_LDFLAGS-to-driver-modules-too.patch   |  162 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 163 insertions(+)

diff --git a/debian/patches/Parse-AM_LDFLAGS-to-driver-modules-too.patch b/debian/patches/Parse-AM_LDFLAGS-to-driver-modules-too.patch
new file mode 100644
index 0000000..101c964
--- /dev/null
+++ b/debian/patches/Parse-AM_LDFLAGS-to-driver-modules-too.patch
@@ -0,0 +1,162 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 1 Sep 2013 08:48:57 +0200
+Subject: Parse AM_LDFLAGS to driver modules too
+
+so we get a RO got
+---
+ src/Makefile.am | 16 ++++++++--------
+ src/Makefile.in | 16 ++++++++--------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 79328a9..f44ac86 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1000,7 +1000,7 @@ libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la
+ if WITH_DRIVER_MODULES
+ mod_LTLIBRARIES += libvirt_driver_xen.la
+ libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la
+-libvirt_driver_xen_la_LDFLAGS = -module -avoid-version
++libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ else
+ noinst_LTLIBRARIES += libvirt_driver_xen.la
+ # Stateful, so linked to daemon instead
+@@ -1050,7 +1050,7 @@ libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la
+ if WITH_DRIVER_MODULES
+ mod_LTLIBRARIES += libvirt_driver_vbox.la
+ libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la
+-libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version
++libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ else
+ noinst_LTLIBRARIES += libvirt_driver_vbox.la
+ # GPLv2-only license requries that it be linked into
+@@ -1083,7 +1083,7 @@ libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la
+ if WITH_DRIVER_MODULES
+ mod_LTLIBRARIES += libvirt_driver_libxl.la
+ libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la
+-libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version
++libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ else
+ noinst_LTLIBRARIES += libvirt_driver_libxl.la
+ # Stateful, so linked to daemon instead
+@@ -1108,7 +1108,7 @@ libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la
+ if WITH_DRIVER_MODULES
+ mod_LTLIBRARIES += libvirt_driver_qemu.la
+ libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la
+-libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version
++libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ else
+ noinst_LTLIBRARIES += libvirt_driver_qemu.la
+ # Stateful, so linked to daemon instead
+@@ -1184,7 +1184,7 @@ libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la
+ if WITH_DRIVER_MODULES
+ mod_LTLIBRARIES += libvirt_driver_uml.la
+ libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la
+-libvirt_driver_uml_la_LDFLAGS = -module -avoid-version
++libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ else
+ noinst_LTLIBRARIES += libvirt_driver_uml.la
+ # Stateful, so linked to daemon instead
+@@ -1361,7 +1361,7 @@ libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la
+ if WITH_DRIVER_MODULES
+ mod_LTLIBRARIES += libvirt_driver_storage.la
+ libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la
+-libvirt_driver_storage_la_LDFLAGS = -module -avoid-version
++libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ else
+ noinst_LTLIBRARIES += libvirt_driver_storage.la
+ # Stateful, so linked to daemon instead
+@@ -1455,7 +1455,7 @@ libvirt_driver_nwfilter_la_CFLAGS = \
+ 		-I$(top_srcdir)/src/access \
+ 		-I$(top_srcdir)/src/conf \
+ 		$(AM_CFLAGS)
+-libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS)
++libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS)
+ libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS)
+ if WITH_DRIVER_MODULES
+ libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la
+@@ -2113,7 +2113,7 @@ if WITH_SANLOCK
+ lockdriver_LTLIBRARIES += sanlock.la
+ sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)
+ sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS)
+-sanlock_la_LDFLAGS = -module -avoid-version
++sanlock_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ sanlock_la_LIBADD = -lsanlock_client \
+ 		../gnulib/lib/libgnu.la
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index a983a3e..0e503a5 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -4136,7 +4136,7 @@ GENERATED_SYM_FILES = \
+ @WITH_XEN_TRUE at libvirt_driver_xen_la_SOURCES = 
+ @WITH_XEN_TRUE at libvirt_driver_xen_la_LIBADD =  \
+ @WITH_XEN_TRUE@	libvirt_driver_xen_impl.la $(am__append_18)
+- at WITH_DRIVER_MODULES_TRUE@@WITH_XEN_TRUE at libvirt_driver_xen_la_LDFLAGS = -module -avoid-version
++ at WITH_DRIVER_MODULES_TRUE@@WITH_XEN_TRUE at libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ # Stateful, so linked to daemon instead
+ #libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la
+ @WITH_XEN_TRUE at libvirt_driver_xen_impl_la_CFLAGS = \
+@@ -4165,7 +4165,7 @@ GENERATED_SYM_FILES = \
+ @WITH_VBOX_TRUE at libvirt_driver_vbox_la_SOURCES = 
+ @WITH_VBOX_TRUE at libvirt_driver_vbox_la_LIBADD =  \
+ @WITH_VBOX_TRUE@	libvirt_driver_vbox_impl.la $(am__append_28)
+- at WITH_DRIVER_MODULES_TRUE@@WITH_VBOX_TRUE at libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version
++ at WITH_DRIVER_MODULES_TRUE@@WITH_VBOX_TRUE at libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ # GPLv2-only license requries that it be linked into
+ # libvirtd and *not* libvirt.so
+ #libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la
+@@ -4185,7 +4185,7 @@ GENERATED_SYM_FILES = \
+ @WITH_LIBXL_TRUE at libvirt_driver_libxl_la_SOURCES = 
+ @WITH_LIBXL_TRUE at libvirt_driver_libxl_la_LIBADD =  \
+ @WITH_LIBXL_TRUE@	libvirt_driver_libxl_impl.la $(am__append_34)
+- at WITH_DRIVER_MODULES_TRUE@@WITH_LIBXL_TRUE at libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version
++ at WITH_DRIVER_MODULES_TRUE@@WITH_LIBXL_TRUE at libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ # Stateful, so linked to daemon instead
+ #libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la
+ @WITH_LIBXL_TRUE at libvirt_driver_libxl_impl_la_CFLAGS = \
+@@ -4202,7 +4202,7 @@ GENERATED_SYM_FILES = \
+ @WITH_QEMU_TRUE at libvirt_driver_qemu_la_LIBADD =  \
+ @WITH_QEMU_TRUE@	libvirt_driver_qemu_impl.la $(am__append_38) \
+ @WITH_QEMU_TRUE@	$(am__append_142)
+- at WITH_DRIVER_MODULES_TRUE@@WITH_QEMU_TRUE at libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version
++ at WITH_DRIVER_MODULES_TRUE@@WITH_QEMU_TRUE at libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ # Stateful, so linked to daemon instead
+ #libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la
+ @WITH_QEMU_TRUE at libvirt_driver_qemu_impl_la_CFLAGS = \
+@@ -4237,7 +4237,7 @@ GENERATED_SYM_FILES = \
+ @WITH_UML_TRUE at libvirt_driver_uml_la_SOURCES = 
+ @WITH_UML_TRUE at libvirt_driver_uml_la_LIBADD =  \
+ @WITH_UML_TRUE@	libvirt_driver_uml_impl.la $(am__append_56)
+- at WITH_DRIVER_MODULES_TRUE@@WITH_UML_TRUE at libvirt_driver_uml_la_LDFLAGS = -module -avoid-version
++ at WITH_DRIVER_MODULES_TRUE@@WITH_UML_TRUE at libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ # Stateful, so linked to daemon instead
+ #libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la
+ @WITH_UML_TRUE at libvirt_driver_uml_impl_la_CFLAGS = \
+@@ -4321,7 +4321,7 @@ libvirt_driver_storage_impl_la_LIBADD = $(SECDRIVER_LIBS) \
+ @WITH_STORAGE_TRUE at libvirt_driver_storage_la_LIBADD =  \
+ @WITH_STORAGE_TRUE@	libvirt_driver_storage_impl.la \
+ @WITH_STORAGE_TRUE@	$(am__append_82)
+- at WITH_DRIVER_MODULES_TRUE@@WITH_STORAGE_TRUE at libvirt_driver_storage_la_LDFLAGS = -module -avoid-version
++ at WITH_DRIVER_MODULES_TRUE@@WITH_STORAGE_TRUE at libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ # Stateful, so linked to daemon instead
+ #libvirt_la_BUILT_LIBADD += libvirt_driver_nodedev.la
+ @WITH_NODE_DEVICES_TRUE at libvirt_driver_nodedev_la_SOURCES =  \
+@@ -4347,7 +4347,7 @@ libvirt_driver_storage_impl_la_LIBADD = $(SECDRIVER_LIBS) \
+ @WITH_NWFILTER_TRUE@		$(AM_CFLAGS)
+ 
+ @WITH_NWFILTER_TRUE at libvirt_driver_nwfilter_la_LDFLAGS =  \
+- at WITH_NWFILTER_TRUE@	$(LD_AMFLAGS) $(am__append_108)
++ at WITH_NWFILTER_TRUE@	$(AM_LDFLAGS) $(am__append_108)
+ @WITH_NWFILTER_TRUE at libvirt_driver_nwfilter_la_LIBADD =  \
+ @WITH_NWFILTER_TRUE@	$(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS) \
+ @WITH_NWFILTER_TRUE@	$(am__append_107)
+@@ -4471,7 +4471,7 @@ man8_MANS = virtlockd.8
+ @LIBVIRT_INIT_SCRIPT_SYSTEMD_TRUE@@WITH_LIBVIRTD_TRUE at SYSTEMD_UNIT_DIR = /lib/systemd/system
+ @WITH_SANLOCK_TRUE at sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)
+ @WITH_SANLOCK_TRUE at sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS)
+- at WITH_SANLOCK_TRUE@sanlock_la_LDFLAGS = -module -avoid-version
++ at WITH_SANLOCK_TRUE@sanlock_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ @WITH_SANLOCK_TRUE at sanlock_la_LIBADD = -lsanlock_client \
+ @WITH_SANLOCK_TRUE@		../gnulib/lib/libgnu.la
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cf6166c..431fa27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
 Fix-make-check-not-finding-finding-the-libvirtd-lens.patch
+Parse-AM_LDFLAGS-to-driver-modules-too.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git

More information about the Pkg-libvirt-commits mailing list