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

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 97 insertions, 2 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/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}"