Fix building with -Wl,--as-needed wrt #259569 by James C. Georgas.

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

4 files changed, 26 insertions, 17 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 20d4b93cecd3..abefbc4ce924 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/device-mapper
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.123 2008/11/07 21:22:19 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.124 2009/12/21 13:26:05 ssuominen Exp $
+
+  21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  device-mapper-1.02.28.ebuild, +files/device-mapper-1.02.28-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #259569 by James C. Georgas.
 
 *device-mapper-1.02.28 (07 Nov 2008)
 
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index a0b7b29d687b..d63901c11f6d 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 547 RMD160 dd73fd37016d4e3a168009574651bf31f5ec0189 SHA1 dcd11d182a3888f2efdbb535ee9f3bb5ebb4ee46 SHA256 6b55e8cac8f47ea7c00ef66ce078826628842b6d13bbebed875bec2188b5e675
 AUX 64-device-mapper.rules-1.02.19 1247 RMD160 2fc15996575c44ffb5a12c16236e221157ff15e6 SHA1 67cd5da22219dba8232e7a95bd7f328d6eb30d90 SHA256 b8a7570321c735b06cfa97cff10a8edffcf508d4e54bd6730e482cb7bdd25347
 AUX 64-device-mapper.rules-1.02.22 999 RMD160 e29014e213c2d41ae360419c038d5644cd931021 SHA1 f3542c4294dcf4e2c4f50d3421b5399f5ab06975 SHA256 84544cac9d4de6cfc44cec816836f194f5f69fbb74cbdd07073f96dae427c0ed
@@ -10,6 +7,7 @@ AUX device-mapper-1.02.22-export-format.diff 11410 RMD160 dac695aa0eef0adfa1dafe
 AUX device-mapper-1.02.24-export-format.diff 11126 RMD160 28fe4d018152f4a36b07106b8323ab5ec0a0cb7b SHA1 5d0a88f91164082297f8b86450ccfeebc2f34dde SHA256 30e6c0c153bdcd68681ec5a0ebf2c2aee21daa2f22759f82b432e412183d2754
 AUX device-mapper-1.02.26-export-format.diff 11120 RMD160 c7abc681027f44a1a2f978d56de9c506464036bd SHA1 348b4d1bd2bb11a03d2d1f43fe568956aeae49d7 SHA256 bd2e40f67a2322565dbcabba3dbda0b16ddb4f5d0587465b10aa0497b1bbaf76
 AUX device-mapper-1.02.27-export-format.diff 10774 RMD160 7e6b804ab39038751e0b6b2c55aef3eb32ae963f SHA1 de3512bb81a06c0b26040ce11ed141ebfcd67a37 SHA256 ddeb28b0ac4aa5c428577da4f8334afb89b48c5b0134127f130f2037f22cb0bd
+AUX device-mapper-1.02.28-asneeded.patch 435 RMD160 e0ec7a6fa60e33c4fac84d5fdd20cfa10c6a3a7b SHA1 1f83d036a59164abb34be73e3fdc7ab7c4cb8603 SHA256 ccb458b942406c30a676ba7d6cfa902ad6d43901c4cdd6be364d447a765fda55
 AUX device-mapper.conf-1.02.22-r3 15 RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a SHA1 0dd47dfb811946a11fbde987e2ce1e105ed7fafb SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22
 AUX device-mapper.rc 615 RMD160 741f1f771665e33f995442567376060a749d56c1 SHA1 a44e73c73865757d8d00161bc07374de535e70bd SHA256 730753883de0e992a0bfa31038780edf31d0957fdbef304fd8880c6d0dc7798e
 AUX device-mapper.rc-1.02.22-r3 628 RMD160 b1339ca0b73549725939ced7d41b1abb5a64e0d0 SHA1 71be882cae2a9181d1a0d65115fef4ec2938a1e1 SHA256 6ab5e09abf2e22cdb7bf0383819f37536ba5ea4a56a91220fa23af6d85dc5d2b
@@ -34,13 +32,6 @@ EBUILD device-mapper-1.02.24.ebuild 2172 RMD160 df8dc287151ac787ce06eafc2e2c7d84
 EBUILD device-mapper-1.02.25.ebuild 2209 RMD160 5663bd0d59c1cd96aea4cc687461d6c6f5933391 SHA1 8dd25dc08b1e8308249a21dcedbc79563242c5fd SHA256 6bf4e832edebc55af6e6103395050eb0a306d8c3369e2be07fee3386ce9f2621
 EBUILD device-mapper-1.02.26.ebuild 2205 RMD160 186bd93dbe53e943b796f73de4250feb53da9733 SHA1 2a6d05e39b5f797b51ef119cde6737a2f3836bf6 SHA256 cf146a63ccfb403a5cc58e444c1a056c616b1ad1695657f63cdf274065d3eac8
 EBUILD device-mapper-1.02.27.ebuild 2180 RMD160 ec212ebf5eb5059d54178aef65f5db3d0d8898eb SHA1 3a832a23d8a48b1a84a41b9eb66bec3064b7aba9 SHA256 5f21cddc16920db505c83cdf3f4a1077cf401ea17d3376ed5d431bc44add0087
-EBUILD device-mapper-1.02.28.ebuild 2210 RMD160 e521ba0a38848c45ec7aed861e5042898cef2582 SHA1 57399111f84581360daa0f490b7f71036691f4f6 SHA256 fc14dd40580bc027f432682f8b70280c0951fbf4677b604bea7216bbe23864cf
-MISC ChangeLog 21582 RMD160 bc6a803ebabac1a4e8f2cd8890e3d9dadbb02adc SHA1 d8b5d21ab6311c93d479b0b61980381424d51c28 SHA256 1a71e466cd9100292dee302e30e1ba88dc6a2146f382e853dc6489bbbf240e60
+EBUILD device-mapper-1.02.28.ebuild 2254 RMD160 af0bcec47fbbf77e98cd0a47e8f629c1361dcb5e SHA1 42522985551c0e5131d85791fae292ab2b67209b SHA256 6651c774cc5a4a10952700edf58ea82e0e30ca14a169571831f92676f6aea353
+MISC ChangeLog 21785 RMD160 37e0e36e902828bfeecbdac81142c6207857bc9f SHA1 ebc6d202c7ee4a247485db3f396b7f7794b440fb SHA256 eabbafbb632a7ab023115c37a3b15d7b5685d824034a92a82f3a568e218c5a82
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklKxiMACgkQoeSe8B0zEfwHJQCfUW0DukgAklnGDZNw0U5Wccbc
-86EAn3fkdiIYlgm5NmicZMlprZM7eqno
-=cWS6
------END PGP SIGNATURE-----
diff --git a/sys-fs/device-mapper/device-mapper-1.02.28.ebuild b/sys-fs/device-mapper/device-mapper-1.02.28.ebuild
index 4ff9d3a515b0..7508f548ae4f 100644
--- a/sys-fs/device-mapper/device-mapper-1.02.28.ebuild
+++ b/sys-fs/device-mapper/device-mapper-1.02.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.28.ebuild,v 1.1 2008/11/07 21:22:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.28.ebuild,v 1.2 2009/12/21 13:26:05 ssuominen Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -22,7 +22,9 @@ S="${WORKDIR}/${PN}.${PV}"
 
 src_unpack() {
 	unpack ${A}
-	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/device-mapper-1.02.27-export-format.diff
+	EPATCH_OPTS="-p1 -d${S}" epatch \
+		"${FILESDIR}"/device-mapper-1.02.27-export-format.diff \
+		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
diff --git a/sys-fs/device-mapper/files/device-mapper-1.02.28-asneeded.patch b/sys-fs/device-mapper/files/device-mapper-1.02.28-asneeded.patch
new file mode 100644
index 000000000000..c5615eaf68ed
--- /dev/null
+++ b/sys-fs/device-mapper/files/device-mapper-1.02.28-asneeded.patch
@@ -0,0 +1,12 @@
+--- device-mapper.1.02.28.orig/dmeventd/Makefile.in	2008-06-27 09:36:51.000000000 -0600
++++ device-mapper.1.02.28/dmeventd/Makefile.in	2009-02-19 00:21:18.000000000 -0700
+@@ -31,8 +31,7 @@
+ 
+ include ../make.tmpl
+ 
+-LDFLAGS += -ldl -ldevmapper -lpthread
+-CLDFLAGS += -ldl -ldevmapper -lpthread
++LIBS += -ldl -ldevmapper -lpthread
+ 
+ dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
+ 	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \