Fix issue where libraries were being added via LDFLAGS instead of LDADD resulting in --as-needed breaking and LDFLAGS appearing to be ignored.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 100 insertions, 4 deletions

diff --git a/app-emulation/libvirt-snmp/ChangeLog b/app-emulation/libvirt-snmp/ChangeLog
index a4f0e08166b5..5c6e88879e21 100644
--- a/app-emulation/libvirt-snmp/ChangeLog
+++ b/app-emulation/libvirt-snmp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/libvirt-snmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-snmp/ChangeLog,v 1.3 2012/06/26 09:34:35 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-snmp/ChangeLog,v 1.4 2012/08/13 05:32:58 cardoe Exp $
+
+*libvirt-snmp-0.0.2-r2 (13 Aug 2012)
+
+  13 Aug 2012; Doug Goldstein <cardoe@gentoo.org>
+  +files/0001-Fix-build-rules-to-use-LDADD-to-add-libraries.patch,
+  -libvirt-snmp-0.0.2-r1.ebuild, +libvirt-snmp-0.0.2-r2.ebuild:
+  Fix issue where libraries were being added via LDFLAGS instead of LDADD
+  resulting in --as-needed breaking and LDFLAGS appearing to be ignored.
 
 *libvirt-snmp-0.0.2-r1 (26 Jun 2012)
 
diff --git a/app-emulation/libvirt-snmp/Manifest b/app-emulation/libvirt-snmp/Manifest
index 0987c59518c8..9b20079942e0 100644
--- a/app-emulation/libvirt-snmp/Manifest
+++ b/app-emulation/libvirt-snmp/Manifest
@@ -1,6 +1,7 @@
+AUX 0001-Fix-build-rules-to-use-LDADD-to-add-libraries.patch 2007 SHA256 37a63c003297772f93e670030860d9a0b98720549d00babc32fdedc2b3ae79af SHA512 1a5392c908af89e44331ebf36c7a223fc70f6841d8bda9d2912e04921a149fc406ebd47e2cab8c0d8982a2c199c9504c46ba0aa0d4a566cb74f1e90aceeb9e87 WHIRLPOOL 53753bd50989e8aee3c34bcb434956721535227995e70694e0de77d25a35855d655d836bea7a84166c73af4545ddd750a84006d1230469279d0fecb96af9d359
 AUX libvirt-snmp.confd 143 SHA256 dfce9b060f546d07893fa05ee0a36e0510f126bcd09929ad9cad31f52ce0ad63 SHA512 15037f146e7d2f72c83927133b07477a8f0c79df417dc37f3d5a58081f4a9d5c950b5160f4c4b419b68430192a178cb9b8550106d4870ace264448a74de5862e WHIRLPOOL 5689eb95fcd5cfb5ad2002841bfbf441b972b5e11f1d800ecba82360e713575647d6505d25cad6c923570b1f3df5709746d6a2cc45bce3038012987a77dd61ef
 AUX libvirt-snmp.initd-r1 769 SHA256 758c7ede3b7549ae0639aa5c4d784ac21d14899d1099472206bf1427fd4f1893 SHA512 2500675f34469b389f383271165da42b23ea87356b3fc5f7d20357cb22ca7557218a324f1fc7d767cf6a57419570d3587d2da3a755cfa4b357383d4ecfa1b879 WHIRLPOOL ef9b5dae9b01067e05001669a6cc4365802c7c4a5e9a139ba10eb3de359b9213e2844faf935823d933eb86c6b6e48d4f52fa2c057b83c63e66b9d449d0285a7b
 DIST libvirt-snmp-0.0.2.tar.gz 152790 SHA256 c54896710ea7cc346a9c241738b342eb624a519166749073be3538230248be2c SHA512 13a522c765d278d3b8f8ab9f32f97c8531f6d131afcb0ce62ae397631db92ed3b585ad221a1f2b3bc17907cc4d61adca4a2071b0458a05f2bff5ca06191e1478 WHIRLPOOL b5f1ada3764d5e8cfbd81814a72b752b40bb41c7aaa7dbd0002f11d687294032773ac2543bf1e4b489c5ea2dc416174f9b7ff42fcd24f5ad824939853d17120a
-EBUILD libvirt-snmp-0.0.2-r1.ebuild 1132 SHA256 f6743cab9dc33c1f5d8cd01e5c555ad7274e83d106dd4e69bda590182c6cc783 SHA512 c0477fd0abb4e2cad3716ba2045877820d77d7ef411c91e2658689b84a4916855347a3d5a50f2850259824ca7b06df78861a504699378f9f5541a052984de47f WHIRLPOOL bfcadcabe4969b4c3325d2bcac6f21e0f7af16b542caf6a74d99d071adba53e30f52a6ec088fd542f68971122dca6ee130792563cbe212b5057889ef5d8e8e3f
-MISC ChangeLog 837 SHA256 0fb59f814c6fc9b730a09e56b0763048006bcd0025eb86a09a843e6693446646 SHA512 6fa902716bc4b504c088386b41332c32bce8e074a223c541e33805fd746520ab901a868c261d366daa7e96cb66fd770739d182cc6e41030d51cbc2fa37199e71 WHIRLPOOL e4e2f61d3fbb8957410a99ec063f59e9293d4a6568a132384e721e629e0aaec3b3a646e21115b30e99366793deb9cadb6df3149cb3c2d33aac51b5ab0a7495e9
+EBUILD libvirt-snmp-0.0.2-r2.ebuild 1244 SHA256 4d38842fd80335812b4be595ce5112eb2472606fdf0d14ac1b8046bd281199d7 SHA512 201a99a76a8886f6cf56ff1ffc8b3b1ffbbd9b3c81ea168d9816823261944992c1f69e9d61b36b4eff5eec9d6ea655e38498c0315b1615adc4b871ab9034e0d3 WHIRLPOOL e725f3607d34cbe5c33e6fab90ba01e681c2030784cab8156e05c35786d1a84823c03adf739311130bef43314a669ac441db578da79a3e3885c74ed2fbba0191
+MISC ChangeLog 1202 SHA256 04509db9cdd410388cdfa9d5788e681f06bc8fd30d5be6e2b144cd90a80a5b7a SHA512 8d48949d8cde06037fa43413ad34311c6c3ce14c5da07f37281220de08c3bec83bdbfac1234bbcfdc1b12118ce189f8f3301206454eaaa6558f6500e462db4e2 WHIRLPOOL fa094429ccbfee48e3f800ed0b12a6bd09cf3073e9bb0335451f48f031498e0d376fedcdbf4606df411deda779ef2ceb6af7c90488f42457ffadd88705a71950
 MISC metadata.xml 242 SHA256 94e76679af5ab7f70d6e580c503ecf19d9955e64e073c0b8cd5c08a8a18930a7 SHA512 f7c65e5ca66432e009b369e2b41ba92f9a972647997e59a8c66e298befe9a117234fb520b1de6897b86ca91693682e73f3e0128bf99cba7cbf9c47ad599b1e48 WHIRLPOOL 919de9e8264f8a10d1375e1d23ed787f05d09664df4aef52b934623bf7ce71ac0eaa69e841fcf38b90cd18cb0d3f91502e5878d304641598dab0ad633b2b7c02
diff --git a/app-emulation/libvirt-snmp/files/0001-Fix-build-rules-to-use-LDADD-to-add-libraries.patch b/app-emulation/libvirt-snmp/files/0001-Fix-build-rules-to-use-LDADD-to-add-libraries.patch
new file mode 100644
index 000000000000..7aa3560cc0f0
--- /dev/null
+++ b/app-emulation/libvirt-snmp/files/0001-Fix-build-rules-to-use-LDADD-to-add-libraries.patch
@@ -0,0 +1,81 @@
+From 810fef8fbf0c4f6383d870a21f729875a8e16f91 Mon Sep 17 00:00:00 2001
+From: Doug Goldstein <cardoe@cardoe.com>
+Date: Mon, 13 Aug 2012 00:18:04 -0500
+Subject: [libvirt-snmp] [PATCH] Fix build rules to use LDADD to add libraries
+
+Fix build rules to use LDADD to add libraries to support --as-needed.
+Also refactored some of the other automake variables in the same fashion
+of the libvirt's automake rules.
+
+Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
+---
+ configure.ac    |    4 ++++
+ src/Makefile.am |   31 ++++++++++++++++---------------
+ 2 files changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a2bb1ac..9d7d03c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,6 +3,10 @@ AM_INIT_AUTOMAKE([-Wall -Werror])
+ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PREREQ([2.50])
++
++AC_PROG_CC
++AM_PROG_CC_C_O
++
+ AC_CHECK_FUNCS([memset])
+ AC_CHECK_FUNCS([strdup])
+ AC_CHECK_HEADERS([stdlib.h])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6d27bf5..622a280 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,19 +1,5 @@
+ bin_PROGRAMS=libvirtMib_subagent
+ 
+-AM_CFLAGS =	\
+-		$(COVERAGE_CFLAGS) \
+-		$(DRIVER_MODULE_CFLAGS) \
+-		$(SNMP_CFLAGS)          \
+-		$(LIBVIRT_CFLAGS) \
+-		$(WARN_CFLAGS)          \
+-		$(LOCK_CHECKING_CFLAGS)
+-
+-AM_LDFLAGS = 	\
+-		$(COVERAGE_LDFLAGS) \
+-		$(PTHREAD_LIBS) \
+-		$(LIBVIRT_LIBS) \
+-		$(SNMP_LIBS)
+-
+ LIBVIRT_OLD_SRCS = \
+ 		threads.c \
+ 		event_poll.c \
+@@ -58,7 +44,22 @@ HDRS = \
+ 		libvirtGuestTable.h
+ 
+ libvirtMib_subagent_SOURCES=${SRCS} ${HDRS}
+-libvirtMib_subagent_LDFLAGS=${AM_LDFLAGS}
++
++libvirtMib_subagent_CFLAGS=		\
++	$(DRIVER_MODULE_CFLAGS)		\
++	$(SNMP_CFLAGS)				\
++	$(LIBVIRT_CFLAGS)			\
++	$(COVERAGE_CFLAGS)			\
++	$(WARN_CFLAGS)				\
++	$(LOCK_CHECKING_CFLAGS)
++
++libvirtMib_subagent_LDFLAGS=	\
++	$(COVERAGE_LDFLAGS)
++
++libvirtMib_subagent_LDADD=		\
++	$(PTHREAD_LIBS)				\
++	$(LIBVIRT_LIBS)				\
++	$(SNMP_LIBS)
+ 
+ if LIBVIRT_OLD
+ libvirtMib_subagent_SOURCES+=${LIBVIRT_OLD_SRCS} ${LIBVIRT_OLD_HDRS}
+-- 
+1.7.8.6
+
diff --git a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r1.ebuild b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild
index 8e72757aabbb..c623de6c2a81 100644
--- a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r1.ebuild
+++ b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r1.ebuild,v 1.1 2012/06/26 09:34:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild,v 1.1 2012/08/13 05:32:58 cardoe Exp $
 
 EAPI=4
 
+inherit eutils
+
 DESCRIPTION="Provides SNMP functionality for libvirt."
 HOMEPAGE="http://libvirt.org"
 SRC_URI="http://www.libvirt.org/sources/snmp/${P}.tar.gz"
@@ -18,6 +20,10 @@ RDEPEND="app-emulation/libvirt
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Fix-build-rules-to-use-LDADD-to-add-libraries.patch
+}
+
 src_install() {
 	default
 	newinitd "${FILESDIR}/libvirt-snmp.initd-r1" "${PN}"