restore cross-compiling support

4 files changed, 12 insertions, 51 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 4e90ebed8c50..15da7e451f78 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -4,10 +4,10 @@ Hash: SHA1
 MD5 e670b6cbe61335991795e8b9a777d3bb ChangeLog 10185
 MD5 f98f75be102af5709caff4cf84eaeb90 busybox-0.60.3-r1.ebuild 1091
 MD5 bb58878c35f17f5bad4aa060f1dcc25e busybox-0.60.3-r2.ebuild 1183
-MD5 489bc43b4a2746195e25235ad52a103b busybox-1.00.ebuild 6815
+MD5 e83eba8a01e868a8f4e82502f87fba22 busybox-1.00.ebuild 6431
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f5178c8fd8c1421ea0f6fa05918d1d4a busybox-1.00-r1.ebuild 7009
-MD5 99fad2bf0042dc1141d3089e9f6baeb2 busybox-1.00_rc3.ebuild 6871
+MD5 ad8c239b486642969948ddb089c91a01 busybox-1.00-r1.ebuild 6626
+MD5 71df974e000a57c12f77ec31a68e06d0 busybox-1.00_rc3.ebuild 6488
 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
 MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772
 MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
@@ -29,7 +29,7 @@ MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBvArJroRuSHgZdywRAgx2AJ42bDs9ONF3UvBx41crGxCGHvgObQCfWYA2
-mUHoQI5hCmOYsQ2pz8bsRwc=
-=q9gY
+iD8DBQFBvPrNroRuSHgZdywRAmYzAJ4/ufpLPd1EJVe7kHNpZXYhlXixoACfQ0hP
+svuWPq8yvIEF+gWgxqG9lZ0=
+=vth6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.00-r1.ebuild b/sys-apps/busybox/busybox-1.00-r1.ebuild
index c934cfadf005..e3f0d1e4f0e9 100644
--- a/sys-apps/busybox/busybox-1.00-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.1 2004/12/11 14:15:53 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.2 2004/12/13 02:13:07 vapier Exp $
 
 inherit eutils
 
@@ -12,7 +12,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~mips ~arm ~amd64 ~sparc ~hppa"
 IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks"
-#IUSE="${IUSE} cross"
 
 MY_PV=${PV/_/-}
 
@@ -95,10 +94,6 @@ src_unpack() {
 	busybox_config_option y FEATURE_SH_IS_ASH
 	busybox_config_option n FEATURE_SH_IS_NONE
 
-	# setting the cross compiler from here would be somewhat of a
-	# pain do to as we would need a multiline sed expression which
-	# does not always seem to work so hot for me.
-
 	use static \
 		&& busybox_config_option y STATIC \
 		|| busybox_config_option n STATIC
@@ -145,15 +140,7 @@ src_unpack() {
 }
 
 busybox_set_cross_compiler() {
-	return 0
-	# revisit this another day.
-	#if use cross ; then
-	#	case ${ARCH} in
-	#		x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
-	#		*) ;;
-	#	esac
-	#fi
-	[ -n "${CROSS}" ] && einfo "Setting cross compiler prefix to ${CROSS}"
+	type -p ${CHOST}-gcc && export CROSS=${CHOST}-
 }
 
 src_compile() {
diff --git a/sys-apps/busybox/busybox-1.00.ebuild b/sys-apps/busybox/busybox-1.00.ebuild
index 3c797ebaef60..514bffde7032 100644
--- a/sys-apps/busybox/busybox-1.00.ebuild
+++ b/sys-apps/busybox/busybox-1.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00.ebuild,v 1.6 2004/12/12 09:09:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00.ebuild,v 1.7 2004/12/13 02:13:07 vapier Exp $
 
 inherit eutils
 
@@ -12,7 +12,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~mips arm ~amd64 sparc hppa"
 IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks"
-#IUSE="${IUSE} cross"
 
 MY_PV=${PV/_/-}
 
@@ -88,10 +87,6 @@ src_unpack() {
 	busybox_config_option y FEATURE_SH_IS_ASH
 	busybox_config_option n FEATURE_SH_IS_NONE
 
-	# setting the cross compiler from here would be somewhat of a
-	# pain do to as we would need a multiline sed expression which
-	# does not always seem to work so hot for me.
-
 	use static \
 		&& busybox_config_option y STATIC \
 		|| busybox_config_option n STATIC
@@ -138,15 +133,7 @@ src_unpack() {
 }
 
 busybox_set_cross_compiler() {
-	return 0
-	# revisit this another day.
-	#if use cross ; then
-	#	case ${ARCH} in
-	#		x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
-	#		*) ;;
-	#	esac
-	#fi
-	[ -n "${CROSS}" ] && einfo "Setting cross compiler prefix to ${CROSS}"
+	type -p ${CHOST}-gcc && export CROSS=${CHOST}-
 }
 
 src_compile() {
diff --git a/sys-apps/busybox/busybox-1.00_rc3.ebuild b/sys-apps/busybox/busybox-1.00_rc3.ebuild
index f3bb578c585a..20aaedbbb019 100644
--- a/sys-apps/busybox/busybox-1.00_rc3.ebuild
+++ b/sys-apps/busybox/busybox-1.00_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.11 2004/10/17 01:25:50 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.12 2004/12/13 02:13:07 vapier Exp $
 
 inherit eutils
 
@@ -12,7 +12,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~mips arm ~amd64 ~sparc hppa"
 IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks"
-#IUSE="${IUSE} cross"
 
 MY_PV=${PV/_/-}
 
@@ -90,10 +89,6 @@ src_unpack() {
 	busybox_config_option y FEATURE_SH_IS_ASH
 	busybox_config_option n FEATURE_SH_IS_NONE
 
-	# setting the cross compiler from here would be somewhat of a
-	# pain do to as we would need a multiline sed expression which
-	# does not always seem to work so hot for me.
-
 	use static \
 		&& busybox_config_option y STATIC \
 		|| busybox_config_option n STATIC
@@ -140,15 +135,7 @@ src_unpack() {
 }
 
 busybox_set_cross_compiler() {
-	return 0
-	# revisit this another day.
-	#if use cross ; then
-	#	case ${ARCH} in
-	#		x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
-	#		*) ;;
-	#	esac
-	#fi
-	[ -n "${CROSS}" ] && einfo "Setting cross compiler prefix to ${CROSS}"
+	type -p ${CHOST}-gcc && export CROSS=${CHOST}-
 }
 
 src_compile() {