Fix building with -Wl,--as-needed wrt #248195 by Diego E. Pettenò.

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

4 files changed, 47 insertions, 10 deletions

diff --git a/net-wireless/linux-wlan-ng-utils/ChangeLog b/net-wireless/linux-wlan-ng-utils/ChangeLog
index 7cb427b4213d..5636f97bbb8f 100644
--- a/net-wireless/linux-wlan-ng-utils/ChangeLog
+++ b/net-wireless/linux-wlan-ng-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/linux-wlan-ng-utils
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-utils/ChangeLog,v 1.4 2007/02/22 03:11:07 peper Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-utils/ChangeLog,v 1.5 2010/06/29 15:27:00 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  linux-wlan-ng-utils-0.2.2.ebuild,
+  +files/linux-wlan-ng-utils-0.2.2-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #248195 by Diego E. Pettenò.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-wireless/linux-wlan-ng-utils/Manifest b/net-wireless/linux-wlan-ng-utils/Manifest
index ceb48526c550..badc2401b7a4 100644
--- a/net-wireless/linux-wlan-ng-utils/Manifest
+++ b/net-wireless/linux-wlan-ng-utils/Manifest
@@ -1,4 +1,5 @@
+AUX linux-wlan-ng-utils-0.2.2-asneeded.patch 452 RMD160 0b8b2692d1e6e1c7b38d9289e9f3a1b23175054e SHA1 d71fabd318be408b7c9869837427d4478dbd9527 SHA256 bb6aa262a40d1eebabe08dc2a0885eb5038ee456979792a46797a98a7bd4986c
 DIST linux-wlan-ng-0.2.2.tar.bz2 458937 RMD160 084493d8bb378cfd30076285b4dfab626c360496 SHA1 c4e5b66e5e7ab7965a158dd6bf39ead69f245b8d SHA256 50d5421f5950450563296eb2aa0356cc19bb18590050f2105fa7b20fe71881f0
-EBUILD linux-wlan-ng-utils-0.2.2.ebuild 876 RMD160 62e812e62179d530d05267b41291cd13a7184b3f SHA1 55675a6f32d1f95714e3ceeff99b977be98837c4 SHA256 45a0e43f7f7b337fb1fd87660e7f7bb7bb3520babd943ff3a45a8c7ffe1b9c33
-MISC ChangeLog 767 RMD160 161dcdc0a3692cfb481d5ea1afc6f60c1bc92e31 SHA1 967fb9bf1362ce3a96c1aaba53819b94515f8465 SHA256 e4001bce559c80c2f598d977ad4f43459065abdd34f7c6d10e9000deab432cc0
+EBUILD linux-wlan-ng-utils-0.2.2.ebuild 982 RMD160 89074a5102cf881be932c308365ad6241fdf025f SHA1 ec7e76908fd48dbf16802cd13891d78cdeb8e3b0 SHA256 4d371129d7f0dcb6969a2e4216a3764f2bc66f851d7d512b9af6287a26f604ba
+MISC ChangeLog 983 RMD160 8e9d7ce2a7fe3c528f403cb31a1792bb0ad5459f SHA1 8a8c89822fb889afbbc9c81ff0f3ab0df3fcad94 SHA256 35720b61e9eff9200e7e332bb8cbb3164a2cee5d0cb5d17e428367ef12313f22
 MISC metadata.xml 254 RMD160 405142be32b3bd0c5b01406de510a6f6eddeb877 SHA1 88ebd9738b470bb9f297a4c1ff0d61a69331c670 SHA256 cf0ce33c8adaba16d53ca70e86c8f768757e89a172711ce03f69baf17912ed15
diff --git a/net-wireless/linux-wlan-ng-utils/files/linux-wlan-ng-utils-0.2.2-asneeded.patch b/net-wireless/linux-wlan-ng-utils/files/linux-wlan-ng-utils-0.2.2-asneeded.patch
new file mode 100644
index 000000000000..4b978598ef95
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-utils/files/linux-wlan-ng-utils-0.2.2-asneeded.patch
@@ -0,0 +1,21 @@
+--- add-ons/keygen/Makefile
++++ add-ons/keygen/Makefile
+@@ -44,6 +44,6 @@
+ 
+ 
+ keygen:
+-	gcc -o keygen keygen.c -lcrypto
++	$(CC) $(CFLAGS) $(LDFLAGS) -o keygen keygen.c -lcrypto
+ 
+ 
+--- add-ons/lwepgen/Makefile
++++ add-ons/lwepgen/Makefile
+@@ -1,7 +1,7 @@
+ default: lwepgen
+ 
+ lwepgen: lwepgen.c
+-	 gcc -Wl,/usr/lib/libcrypto.so -o lwepgen lwepgen.c
++	 $(CC) $(CFLAGS) $(LDFLAGS) -o lwepgen lwepgen.c -lcrypto
+ 	 
+ lwepgen.c:
+ 	echo lwepgen.c missing!
diff --git a/net-wireless/linux-wlan-ng-utils/linux-wlan-ng-utils-0.2.2.ebuild b/net-wireless/linux-wlan-ng-utils/linux-wlan-ng-utils-0.2.2.ebuild
index 6e8d610704bc..2d8834af17a9 100644
--- a/net-wireless/linux-wlan-ng-utils/linux-wlan-ng-utils-0.2.2.ebuild
+++ b/net-wireless/linux-wlan-ng-utils/linux-wlan-ng-utils-0.2.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-utils/linux-wlan-ng-utils-0.2.2.ebuild,v 1.4 2006/04/02 12:03:28 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-utils/linux-wlan-ng-utils-0.2.2.ebuild,v 1.5 2010/06/29 15:27:00 ssuominen Exp $
+
+inherit eutils toolchain-funcs
 
 MY_P=${P/-utils/}
-S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Key generators from the linux-wlan-ng project."
 HOMEPAGE="http://linux-wlan.org"
@@ -12,20 +13,29 @@ SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-
 IUSE=""
 
 DEPEND="dev-libs/openssl
 		!<net-wireless/linux-wlan-ng-0.2.2"
 RDEPEND="${DEPEND}"
 
+S=${WORKDIR}/${MY_P}
+
 KEYGENS="keygen lwepgen"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_compile() {
+	tc-export CC
+
 	for keygen in ${KEYGENS}; do
 		cd add-ons/${keygen}
-		make ${keygen} || die "Failed to make ${keygen}"
-		cd ${S}
+		emake ${keygen} || die
+		cd "${S}"
 	done
 }