From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Fri, 7 Oct 2005 00:54:44 +0000 (+0000)
Subject: Fix ABI on crosscompile.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ad2280040fc62052167c168a435a7f722149c81;p=gentoo.git

Fix ABI on crosscompile.
Package-Manager: portage-2.0.53_rc3
---

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8ae59a7d265a..357f71132498 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -129,15 +129,15 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 cdbe2c23324cb303ee28f52927bd64f2 glibc-2.3.4.20050125-r1.ebuild 39566
 MD5 f9ecdb0b89b5b8a0667a86d40dfbc9c9 glibc-2.3.5-r1.ebuild 40292
-MD5 c82b5bb1e05837d7e37020f7af5ce49e glibc-2.3.5-r2.ebuild 38526
+MD5 e301599df0999a9b9d18b6ddf079fb86 glibc-2.3.5-r2.ebuild 38041
 MD5 65203448f3153faa1943b035e7c18e5f glibc-2.3.5.20050421.ebuild 40178
-MD5 8f04adfd1684892ef3f8887b20728c5f glibc-2.3.5.20050722.ebuild 38737
+MD5 92233da75aa90330697372b0899fc084 glibc-2.3.5.20050722.ebuild 38768
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDRcP4OpjtAl+gMRURApP8AKDU8vf4X+QK4tI1vdUc5cbp0Ux3UQCgwkoo
-WuMfTTh4OVfOtiCyiwTccj4=
-=8OLz
+iD8DBQFDRcdlOpjtAl+gMRURAmbMAJ9lpWdL8tkFcK3doquCxkJpZcUBHwCeISjj
+wQCZ9l+h4AtH9AWKNeW+MAQ=
+=/oUt
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index 31c04cead93f..6f097c618817 100644
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.2 2005/10/07 00:40:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.3 2005/10/07 00:54:44 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -970,6 +970,8 @@ setup_env() {
 
 		# We only install for this CTARGET on crosscompilers
 		MULTILIB_ABIS=${DEFAULT_ABI}
+
+		ABI=${DEFAULT_ABI:-default}
 	fi
 
 	export ABI=${ABI:-${DEFAULT_ABI:-default}}
@@ -999,6 +1001,7 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
+
 RDEPEND="virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
@@ -1126,21 +1129,17 @@ src_compile() {
 	setup_env
 
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				src_compile
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
+		OABI=${ABI}
+		einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+		for ABI in $(get_install_abis) ; do
+			export ABI
+			src_compile
+		done
+		ABI=${OABI}
+		unset OABI
+		return 0
 	fi
+	unset MLTEST
 
 	toolchain-glibc_src_compile
 }
@@ -1149,22 +1148,18 @@ src_test() {
 	setup_env
 
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				einfo "   Testing ${ABI} glibc"
-				src_test
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
+		OABI=${ABI}
+		einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+		for ABI in $(get_install_abis) ; do
+			export ABI
+			einfo "   Testing ${ABI} glibc"
+			src_test
+		done
+		ABI=${OABI}
+		unset OABI
+		return 0
 	fi
+	unset MLTEST
 
 	toolchain-glibc_src_test
 }
@@ -1173,21 +1168,17 @@ src_install() {
 	setup_env
 
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				src_install
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
+		OABI=${ABI}
+		einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+		for ABI in $(get_install_abis) ; do
+			export ABI
+			src_install
+		done
+		ABI=${OABI}
+		unset OABI
+		return 0
 	fi
+	unset MLTEST
 
 	# Handle stupid lib32 BS
 	unset OLD_LIBDIR
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index f3751a94c8f4..ca514aece034 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.18 2005/10/07 00:40:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.19 2005/10/07 00:54:44 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -973,6 +973,8 @@ setup_env() {
 
 		# We only install for this CTARGET on crosscompilers
 		MULTILIB_ABIS=${DEFAULT_ABI}
+
+		ABI=${DEFAULT_ABI:-default}
 	fi
 
 	export ABI=${ABI:-${DEFAULT_ABI:-default}}