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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 44 insertions, 8 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/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
 }