Fix bug #69281.

9 files changed, 39 insertions, 29 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 270683de28f8..7ff3d4799e57 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.16 2004/10/26 10:15:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.17 2004/11/01 11:49:36 brix Exp $
+
+  01 Nov 2004; Henrik Brix Andersen <brix@gentoo.org>
+  hostap-driver-0.1.1.ebuild, hostap-driver-0.1.2-r1.ebuild,
+  hostap-driver-0.1.2-r2.ebuild, hostap-driver-0.1.2.ebuild,
+  hostap-driver-0.1.3.ebuild, hostap-driver-0.2.4.ebuild,
+  hostap-driver-0.2.5.ebuild:
+  Use tc-getCC() from toolchain-funcs.eclass, fixes bug #69281.
 
   26 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
   hostap-driver-0.2.5.ebuild:
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index da6e20b8ffc2..9bb8c5aa9bf8 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,12 +1,12 @@
-MD5 e473de19e03877a875c8398fbf2ee3d0 hostap-driver-0.1.3.ebuild 2903
-MD5 1a4e9f348ea1158f85e73de05b21a333 hostap-driver-0.1.2-r1.ebuild 3818
-MD5 878a0269474add253e99017cbaf1b6ff hostap-driver-0.1.2.ebuild 3715
-MD5 5204f4f31a6209475697caa8d44c72ae hostap-driver-0.2.5.ebuild 3121
-MD5 a2593a329214efd6d27d3f814027f62d hostap-driver-0.1.2-r2.ebuild 2801
-MD5 631fd8e627124d4451ce6086467b998f ChangeLog 2830
+MD5 21e03519360fbce8cc94ba353e3bbced hostap-driver-0.1.3.ebuild 2922
+MD5 0357db35292e4c201c1506437bb3cc14 hostap-driver-0.1.2-r1.ebuild 3837
+MD5 4edd5bce6a9f6b95029457b5c01aa712 hostap-driver-0.1.2.ebuild 3734
+MD5 08b001ac4fb3ad3de51ef019a8833f6c hostap-driver-0.2.5.ebuild 3201
+MD5 64073e833299cf5c17ad5e2468e418e7 hostap-driver-0.1.2-r2.ebuild 2821
+MD5 cb742c4bf76c73ba75fd085f8fe1c595 ChangeLog 3159
 MD5 e4c2a5b184138acc2d5252edc1be21bc metadata.xml 822
-MD5 20f9f6a9699fd0354a643f954d80d121 hostap-driver-0.1.1.ebuild 3715
-MD5 92d55eabbd0b692b3d0f94662c930f7b hostap-driver-0.2.4.ebuild 2678
+MD5 9bc449f25ca167e784ff540a4e27921a hostap-driver-0.1.1.ebuild 3734
+MD5 d6feaba6faa14fd7f48bfbe13a2309dc hostap-driver-0.2.4.ebuild 2700
 MD5 78c715b9cdf2bea54162336e24f114d1 files/hostap-driver-0.1.3.firmware.diff.bz2 591
 MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2-r1 71
 MD5 7404c72c79e3c743a94815cff4146633 files/digest-hostap-driver-0.1.2-r2 441
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild
index 7ceadcea11d7..3a0f75f57c9a 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild,v 1.6 2004/08/09 22:32:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.1.ebuild,v 1.7 2004/11/01 11:49:36 brix Exp $
 
-inherit eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -22,7 +22,7 @@ src_unpack() {
 	cd "${S}"
 
 	## set compiler options
-	sed -i -e "s:gcc:${CC}:" "${S}/Makefile"
+	sed -i -e "s:gcc:$(tc-getCC):" "${S}/Makefile"
 	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
 
 	## fix for new coreutils (#31801)
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
index 7281e9ef60cb..b493e236d52f 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild,v 1.5 2004/08/09 22:32:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild,v 1.6 2004/11/01 11:49:36 brix Exp $
 
-inherit eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -23,7 +23,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
 
 	## set compiler options
-	sed -i -e "s:gcc:${CC}:" "${S}/Makefile"
+	sed -i -e "s:gcc:$(tc-getCC):" "${S}/Makefile"
 	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
 
 	## fix for new coreutils (#31801)
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild
index 02b7d8f6fea0..be4e7cfb91e1 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild,v 1.5 2004/08/12 18:48:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r2.ebuild,v 1.6 2004/11/01 11:49:36 brix Exp $
 
 # pcmcia eclass inherits eutils
-inherit pcmcia eutils
+inherit toolchain-funcs pcmcia eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -27,7 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
 
 	## set compiler options
-	sed -i -e "s:gcc:${CC}:" ${S}/Makefile
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
 	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
 
 	## fix for new coreutils (#31801)
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild
index 413a1340cc58..6103ee634015 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild,v 1.5 2004/08/09 22:32:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2.ebuild,v 1.6 2004/11/01 11:49:36 brix Exp $
 
-inherit eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -22,7 +22,7 @@ src_unpack() {
 	cd "${S}"
 
 	## set compiler options
-	sed -i -e "s:gcc:${CC}:" "${S}/Makefile"
+	sed -i -e "s:gcc:$(tc-getCC):" "${S}/Makefile"
 	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
 
 	## fix for new coreutils (#31801)
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild
index 08984f098635..bef4e49f98a6 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild,v 1.5 2004/08/09 22:32:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.3.ebuild,v 1.6 2004/11/01 11:49:36 brix Exp $
 
 # pcmcia eclass inherits eutils
-inherit pcmcia eutils
+inherit toolchain-funcs pcmcia eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -27,7 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
 
 	## set compiler options
-	sed -i -e "s:gcc:${CC}:" ${S}/Makefile
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
 	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
 
 	## fix for new coreutils (#31801)
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild
index 7043734a9109..1c382f9ea001 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild,v 1.1 2004/09/14 16:22:46 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.4.ebuild,v 1.2 2004/11/01 11:49:36 brix Exp $
 
-inherit pcmcia kernel-mod
+inherit toolchain-funcs pcmcia kernel-mod
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -26,7 +26,7 @@ src_unpack() {
 	cd ${S}
 
 	## set compiler options
-	sed -i -e "s:gcc:${CC}:" ${S}/Makefile
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
 
 	## fix for new coreutils (#31801)
 	sed -i -e "s:tail -1:tail -n 1:" ${S}/Makefile
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
index f2b65ba13661..66b70012d012 100644
--- a/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild,v 1.2 2004/10/26 10:15:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.5.ebuild,v 1.3 2004/11/01 11:49:36 brix Exp $
 
-inherit pcmcia kernel-mod eutils
+inherit toolchain-funcs pcmcia kernel-mod eutils
 
 DESCRIPTION="HostAP wireless drivers"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -32,6 +32,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	## set compiler
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
+
 	# unpack the pcmcia-cs sources if needed
 	pcmcia_src_unpack