Fix building with -Wl,--as-needed wrt #248411 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 59 insertions, 20 deletions

diff --git a/sys-cluster/feedbackd-agent/ChangeLog b/sys-cluster/feedbackd-agent/ChangeLog
index c183d290f24f..7ddf3fb4950f 100644
--- a/sys-cluster/feedbackd-agent/ChangeLog
+++ b/sys-cluster/feedbackd-agent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/feedbackd-agent
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/feedbackd-agent/ChangeLog,v 1.12 2009/09/23 20:40:06 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/feedbackd-agent/ChangeLog,v 1.13 2010/03/29 12:25:26 ssuominen Exp $
+
+  29 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  feedbackd-agent-0.4.ebuild, +files/feedbackd-agent-0.4-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #248411 by Kacper Kowalik.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   feedbackd-agent-0.4.ebuild:
diff --git a/sys-cluster/feedbackd-agent/Manifest b/sys-cluster/feedbackd-agent/Manifest
index b5766399b939..5a08b6dfc644 100644
--- a/sys-cluster/feedbackd-agent/Manifest
+++ b/sys-cluster/feedbackd-agent/Manifest
@@ -1,5 +1,5 @@
-AUX compile-gnu-source.patch 346 RMD160 dee6d82346d8f4f5c36ab7534045c203d3fb1967 SHA1 c90d67ccc1319d10df280138a14f5e321620d34b SHA256 a6bf214a9cf54f4c556e3594fb68ed6401a35814d1978772e476e4e1719a8bd4
+AUX feedbackd-agent-0.4-asneeded.patch 1079 RMD160 6410199785b82e3ce93ff982d40c629586291414 SHA1 2d942dad560051d42945d2a05aadcc8db4938299 SHA256 bdca5fc14ea24b15d152ca5a63cf35ee4cc51ef009f6b0e2e11159af9a7afc99
 DIST feedbackd-agent-0.4.tar.gz 69078 RMD160 1cb84abfd86b0fb12a93b99b63bc8c4190b610a9 SHA1 eab7014235139bbc6e7057bebad406e6c79b2515 SHA256 0e1cf74d26387e5ce2591f29b92a19dfcd29b005585d363baa717c03705e49c8
-EBUILD feedbackd-agent-0.4.ebuild 867 RMD160 8c040112d8c5b53822c597a3045064bf79d61f2e SHA1 5cbb9d3a38658706055131dd0b28a56574ceb295 SHA256 d95338d28af7734968af79e40780587f7e2dad0b794266336e294c5dc0f4d904
-MISC ChangeLog 1419 RMD160 b0046cde7ebfdcf4cff8394f6b032e37202d8ece SHA1 4bc2c16839bcb5c51d2c9f30537b80589f2e639c SHA256 6d6a4ecbc324cfa3bd1bd4928d8ec3be3d2bce7e5ae3901d9d80d3a578f1bd8a
+EBUILD feedbackd-agent-0.4.ebuild 944 RMD160 0deb3d1e826ccaf0481463e1b898c0a0594f5cef SHA1 f9f6f341e46474b6425aca0682c144a1416cee56 SHA256 fea4ceab6dcce452119e4495ff3bbc9a8155a37d5d2a92cee7736cc6cd9af89d
+MISC ChangeLog 1616 RMD160 e1575c9bacc95db5e266bc74d067b9a8b068226d SHA1 848b81c95f32e8617c67d3c1a4d1072b2e26d33e SHA256 2175dc2440c0db80347528428f3c281a700f798c176a2a6862194b67d270a6b3
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
diff --git a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
index 4753d25242ba..6fa2eb06cd9e 100644
--- a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
+++ b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild,v 1.4 2009/09/23 20:40:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild,v 1.5 2010/03/29 12:25:26 ssuominen Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="system for dynamic feedback of server loads in a Linux Virtual Server (LVS)-based cluster"
 HOMEPAGE="http://ozlabs.org/~jk/projects/feedbackd/"
@@ -16,6 +16,12 @@ IUSE=""
 DEPEND="dev-libs/libxml2
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_compile() {
 	econf \
 		--sysconfdir=/etc \
@@ -30,5 +36,5 @@ src_compile() {
 src_install() {
 	#make DESTDIR=${D} install || die
 	einstall || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dodoc ChangeLog NEWS README
 }
diff --git a/sys-cluster/feedbackd-agent/files/compile-gnu-source.patch b/sys-cluster/feedbackd-agent/files/compile-gnu-source.patch
deleted file mode 100644
index 819cedba6494..000000000000
--- a/sys-cluster/feedbackd-agent/files/compile-gnu-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- feedbackd-agent-0.3.1/src/plugins/Makefile.in.chris	2004-05-17 22:33:07.000000000 +0200
-+++ feedbackd-agent-0.3.1/src/plugins/Makefile.in	2004-05-17 22:33:20.000000000 +0200
-@@ -46,7 +46,7 @@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -D_GNU_SOURCE
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
diff --git a/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch b/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch
new file mode 100644
index 000000000000..9a29a3fa59eb
--- /dev/null
+++ b/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch
@@ -0,0 +1,40 @@
+--- Makefile.in
++++ Makefile.in
+@@ -34,13 +34,16 @@
+ # build flags
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@ @DEFS@ -I.
+-LDFLAGS = @LDFLAGS@ @LIBS@
++LDFLAGS = @LDFLAGS@ 
++LIBS = @LIBS@
+ 
+ XML_CFLAGS = @XML_CFLAGS@
+-XML_LDFLAGS = @XML_LDFLAGS@ @XML_LIBS@
++XML_LDFLAGS = @XML_LDFLAGS@ 
++LIBS += @XML_LIBS@
+ 
+ PERL_CFLAGS = @PERL_CFLAGS@
+-PERL_LDFLAGS = @PERL_LDFLAGS@ @PERL_LIBS@
++PERL_LDFLAGS = @PERL_LDFLAGS@ 
++LIBS += @PERL_LIBS@
+ 
+ # build targets
+ PLUGINS = @PLUGINS@
+@@ -63,7 +66,7 @@
+ # feedbackd-agent main program
+ $(AGENT): src/feedbackd-agent
+ 
+-src/feedbackd-agent: $(foreach f, $($(AGENT)_objs), src/$(f).o)
++src/feedbackd-agent: $(foreach f, $($(AGENT)_objs), src/$(f).o) $(LIBS)
+ 
+ src/feedbackd-agent: CFLAGS  += $(XML_CFLAGS)
+ src/feedbackd-agent: LDFLAGS += $(XML_LDFLAGS)
+@@ -75,7 +78,7 @@
+ $(PLUGINS) : % : src/plugins/%.so
+ 
+ src/plugins/%.so: src/plugins/%.o
+-	$(CC) -shared -nostartfiles $(LDFLAGS) -o $@ $^
++	$(CC) -shared -nostartfiles $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ src/plugins/%.so: CFLAGS+=-fPIC $(XML_CFLAGS)
+ src/plugins/%.so: LDFLAGS+=$(XML_LDFLAGS)