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

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

4 files changed, 31 insertions, 4 deletions

diff --git a/sys-apps/hwinfo/ChangeLog b/sys-apps/hwinfo/ChangeLog
index 35c7b3baa1e8..6e1946caad66 100644
--- a/sys-apps/hwinfo/ChangeLog
+++ b/sys-apps/hwinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwinfo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.14 2010/02/23 17:30:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.15 2010/06/29 18:29:21 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> hwinfo-16.0.ebuild,
+  +files/hwinfo-16.0-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #313369 by Kacper Kowalik.
 
   23 Feb 2010; Markos Chandras <hwoarang@gentoo.org> hwinfo-16.0.ebuild:
   Stable on amd64 wrt bug #305499
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 41ad21ea22d8..83a5aa989bab 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,6 @@
 AUX hwinfo-13.0-makefile-fixes.patch 465 RMD160 9ee69b43fb1cd158b1858cca4be1061689c83a28 SHA1 3090b80d5a03f8fd4667187bb7c1bf65812cd6fa SHA256 1fd1324f81e9f4e7418223bee75f36d3e328ed70bd6c3d394f519da4127de7b5
 AUX hwinfo-13.11-makefile-fixes.patch 496 RMD160 39ef9c0cd6669b7258b27bcf77dce37b185184d6 SHA1 716151df939a21ffe2f6ca392985ac00a0d6e452 SHA256 f5d6d2f1ea47a10af21697184c2e259689fc7847adcff9e5f31cb6118ea29612
+AUX hwinfo-16.0-asneeded.patch 509 RMD160 5153b4db0c6b5bb8757f4c903df200317f398a6b SHA1 209d71ae7e7777a39f618f037f5b35a5d209a05b SHA256 8fe19777c1f6991265b59c200b213b50c38ddccbcbfb771f1026621d33d1fce8
 AUX hwinfo-16.0-parallel-fixes.patch 1299 RMD160 81446781340f6a85365eb344289b09a5f321185c SHA1 56f2ddd26a5bafbab807f94fbfe1f55550c5fe04 SHA256 100e1072c1b9e6b8e9705431f295396ba810d82a5f995d65028a0ed0331cfd9f
 AUX hwinfo-8.38-makefile-fixes.patch 2119 RMD160 1e5ee878154f78cfea59a7481542cad53eb1541c SHA1 d45797c8dc5b42b184679ea0ab903e35ac6fe264 SHA256 7db701f829dee500d286cc70c312342aac3d5d96e5192f028ccbaf02558d629a
 DIST hwinfo-8.38.tar.gz 569050 RMD160 3ccb827a4addb2688f7b1c7faf661ef8a6667c2f SHA1 339863afbd3472a6db266976398aa1b1157402cd SHA256 5b77373beb11ad558ba786a279580143214e1b5bd3e873b191c72bc266224ea2
@@ -14,7 +15,7 @@ DIST hwinfo_16.0.orig.tar.gz 858557 RMD160 c80dddcef1416d29db31d036ef6a6affcd848
 EBUILD hwinfo-13.0.ebuild 1600 RMD160 e0169913f8be960f1bde0882fb0bd7b75e52c525 SHA1 a5b5f3164d688abf35ccee44ede56c4d6f3bc41a SHA256 1ed60ad57d5f652fd1e59dfee680dd081d7ad58ba46aded5f90c904ec70d442a
 EBUILD hwinfo-13.28.ebuild 1551 RMD160 5aeecdec87b37ffbfb25574d0d6739da97f81630 SHA1 579bda42de0cdd3564648f1d8cb27b7d1b12c236 SHA256 d4408f4553accbcb5f820192acb38270955aea1af9942697fb7d6277529be7c6
 EBUILD hwinfo-14.19.ebuild 1548 RMD160 dbbd844f80a3efd2659b7e63d3e0a9460deb96fc SHA1 abe4183008c76c48c9d54b939b7152439e48ebc9 SHA256 c892b9ed3536892b6cb9bb673279240a9ee49f807e0f58ebe4e735e89007bf42
-EBUILD hwinfo-16.0.ebuild 2503 RMD160 9379f9e4fbf85377cb9e0c0d7aa79aba3b214937 SHA1 f245bba12a9d1c2d22683cf7c3be79826ead5679 SHA256 4a26d62002842bbc47e8a8729c806433a9dbac128d5ce33f2c7fe1774a4d3cad
+EBUILD hwinfo-16.0.ebuild 2702 RMD160 6ca08ab889de98a05c15ed27c000592614b5cb7d SHA1 0b97b567ecf95f62268b3bc67ff0205aa441b566 SHA256 273a1c1bae6a131688707182b31dafffecdd25cd4f15227c7d1a985763f52ecc
 EBUILD hwinfo-8.38.ebuild 1068 RMD160 0fc76f8e03dd98d767acc93a56f7e3b439c3ebb4 SHA1 bae99b7b341acb34196ff4b37ed77342648d7628 SHA256 7e83114e43d7e99a210fd33446016b11ea72a4b3d04360f00d5e109b2f094fc0
-MISC ChangeLog 2386 RMD160 77ba42ba0b9ba4dfe48c9039421f6957e33dffb2 SHA1 5a508dc2ae1b581062b2cf1ae9f4e54203964023 SHA256 d924d7e31e627055c7a3cbd9ca4fcf73cad32d914443db610c45d4a6295e8501
+MISC ChangeLog 2566 RMD160 3cf7fbb1b260ba8eefffcc84025d6431c9c3882b SHA1 5eb42fa16cfa40c7315d1f7e9129d6aacb5506e2 SHA256 e091baa0b3cb3dbdc70f5e74d8738743cb9faf955d5c81f9cc21346c07e2a66b
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/sys-apps/hwinfo/files/hwinfo-16.0-asneeded.patch b/sys-apps/hwinfo/files/hwinfo-16.0-asneeded.patch
new file mode 100644
index 000000000000..571a757a8583
--- /dev/null
+++ b/sys-apps/hwinfo/files/hwinfo-16.0-asneeded.patch
@@ -0,0 +1,18 @@
+Fixing as-needed issues and respecting LDFLAGS
+
+http://bugs.gentoo.org/313369
+
+--- src/Makefile
++++ src/Makefile
+@@ -23,9 +23,9 @@
+ 
+ ifdef SHARED_FLAGS
+ $(LIBHD_SO): $(LIBHD)
+-	$(CC) -shared $(SO_LIBS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \
++	$(CC) $(LDFLAGS) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \
+ 		-Wl,-soname=$(LIBHD_SONAME) \
+-		-o $(LIBHD_SO) 
++		-o $(LIBHD_SO) $(SO_LIBS) 
+ 	ln -snf $(LIBHD_NAME) $(LIBHD_SONAME)
+ 	ln -snf $(LIBHD_SONAME) $(LIBHD_BASE).so
+ else
diff --git a/sys-apps/hwinfo/hwinfo-16.0.ebuild b/sys-apps/hwinfo/hwinfo-16.0.ebuild
index 691e41db4eb8..4a076f1e348c 100644
--- a/sys-apps/hwinfo/hwinfo-16.0.ebuild
+++ b/sys-apps/hwinfo/hwinfo-16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-16.0.ebuild,v 1.4 2010/02/23 17:30:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-16.0.ebuild,v 1.5 2010/06/29 18:29:21 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -51,6 +51,10 @@ src_prepare() {
 	echo 'libs: subdirs' >>"${S}"/Makefile
 	echo 'ranlib: $(LIBHD) subdirs' >>"${S}"/Makefile
 	echo -e "\tranlib \$(LIBHD)" >>"${S}"/Makefile
+
+	sed -i -e 's/LDFLAGS	= /LDFLAGS := $(LDFLAGS) /' "${S}"/Makefile.common || die
+	sed -i -e 's/(CFLAGS)/& $(LDFLAGS)/' "${S}"/src/ids/Makefile || die
+	epatch "${FILESDIR}"/${PN}-16.0-asneeded.patch
 }
 
 src_compile(){