|
 |
adeaf8 |
From bd4e7f927fcc2edcba29e441973389ad845d648c Mon Sep 17 00:00:00 2001
|
|
|
adeaf8 |
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
|
adeaf8 |
Date: Sun, 1 Sep 2013 08:50:58 +0200
|
|
|
adeaf8 |
Subject: [PATCH] Pass AM_LDFLAGS to driver modules too
|
|
|
adeaf8 |
|
|
|
adeaf8 |
This gives us a RO got, otherwise Debian's lintian complains:
|
|
|
adeaf8 |
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_vbox.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_xen.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so
|
|
|
adeaf8 |
W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so
|
|
|
adeaf8 |
W: libvirt-sanlock: hardening-no-relro usr/lib/libvirt/lock-driver/sanlock.so
|
|
|
adeaf8 |
(cherry picked from commit f1f0e53b0814aab3c093f1219da95c0f836cdf4a)
|
|
|
adeaf8 |
---
|
|
|
adeaf8 |
src/Makefile.am | 14 +++++++-------
|
|
|
adeaf8 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
adeaf8 |
|
|
|
adeaf8 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
adeaf8 |
index 19dfb81..097682c 100644
|
|
|
adeaf8 |
--- a/src/Makefile.am
|
|
|
adeaf8 |
+++ b/src/Makefile.am
|
|
|
adeaf8 |
@@ -1000,7 +1000,7 @@ libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la
|
|
|
adeaf8 |
if WITH_DRIVER_MODULES
|
|
|
adeaf8 |
mod_LTLIBRARIES += libvirt_driver_xen.la
|
|
|
adeaf8 |
libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
-libvirt_driver_xen_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
else
|
|
|
adeaf8 |
noinst_LTLIBRARIES += libvirt_driver_xen.la
|
|
|
adeaf8 |
# Stateful, so linked to daemon instead
|
|
|
adeaf8 |
@@ -1050,7 +1050,7 @@ libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la
|
|
|
adeaf8 |
if WITH_DRIVER_MODULES
|
|
|
adeaf8 |
mod_LTLIBRARIES += libvirt_driver_vbox.la
|
|
|
adeaf8 |
libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
-libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
else
|
|
|
adeaf8 |
noinst_LTLIBRARIES += libvirt_driver_vbox.la
|
|
|
adeaf8 |
# GPLv2-only license requries that it be linked into
|
|
|
adeaf8 |
@@ -1083,7 +1083,7 @@ libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la
|
|
|
adeaf8 |
if WITH_DRIVER_MODULES
|
|
|
adeaf8 |
mod_LTLIBRARIES += libvirt_driver_libxl.la
|
|
|
adeaf8 |
libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
-libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
else
|
|
|
adeaf8 |
noinst_LTLIBRARIES += libvirt_driver_libxl.la
|
|
|
adeaf8 |
# Stateful, so linked to daemon instead
|
|
|
adeaf8 |
@@ -1108,7 +1108,7 @@ libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la
|
|
|
adeaf8 |
if WITH_DRIVER_MODULES
|
|
|
adeaf8 |
mod_LTLIBRARIES += libvirt_driver_qemu.la
|
|
|
adeaf8 |
libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
-libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
else
|
|
|
adeaf8 |
noinst_LTLIBRARIES += libvirt_driver_qemu.la
|
|
|
adeaf8 |
# Stateful, so linked to daemon instead
|
|
|
adeaf8 |
@@ -1184,7 +1184,7 @@ libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la
|
|
|
adeaf8 |
if WITH_DRIVER_MODULES
|
|
|
adeaf8 |
mod_LTLIBRARIES += libvirt_driver_uml.la
|
|
|
adeaf8 |
libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
-libvirt_driver_uml_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
else
|
|
|
adeaf8 |
noinst_LTLIBRARIES += libvirt_driver_uml.la
|
|
|
adeaf8 |
# Stateful, so linked to daemon instead
|
|
|
adeaf8 |
@@ -1361,7 +1361,7 @@ libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la
|
|
|
adeaf8 |
if WITH_DRIVER_MODULES
|
|
|
adeaf8 |
mod_LTLIBRARIES += libvirt_driver_storage.la
|
|
|
adeaf8 |
libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
-libvirt_driver_storage_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
else
|
|
|
adeaf8 |
noinst_LTLIBRARIES += libvirt_driver_storage.la
|
|
|
adeaf8 |
# Stateful, so linked to daemon instead
|
|
|
adeaf8 |
@@ -2114,7 +2114,7 @@ if WITH_SANLOCK
|
|
|
adeaf8 |
lockdriver_LTLIBRARIES += sanlock.la
|
|
|
adeaf8 |
sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES)
|
|
|
adeaf8 |
sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
|
|
adeaf8 |
-sanlock_la_LDFLAGS = -module -avoid-version
|
|
|
adeaf8 |
+sanlock_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
|
|
adeaf8 |
sanlock_la_LIBADD = -lsanlock_client \
|
|
|
adeaf8 |
../gnulib/lib/libgnu.la
|
|
|
adeaf8 |
|