remove mips64 checks and re-enable multilib code for all targets

Package-Manager: portage-2.0.53_rc4

2 files changed, 11 insertions, 29 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0b48566a440e..0d868c5a5da4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -129,7 +129,7 @@ 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 bd5bf79d303a7365ff19d7021465369d glibc-2.3.5-r1.ebuild 40631
-MD5 e9dd8f4e1848048d642c6271d8d767ba glibc-2.3.5-r2.ebuild 38950
+MD5 aca85f14c46bfc2acbf8a5d29b7215e5 glibc-2.3.5-r2.ebuild 38318
 MD5 5939b81f0fa59cc654755058a684dee7 glibc-2.3.5.20050421.ebuild 40224
 MD5 c8b67d0b495ba2ccdc0e67c3f40c76c0 glibc-2.3.5.20050722.ebuild 39371
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
@@ -137,7 +137,7 @@ MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDSKFlgIKl8Uu19MoRAvMkAJ9i/FDDdUXzbnFz/absav0IBTggtgCfQxrJ
-r2/AHFvCGM7abXgyfU6ZDXg=
-=EbY3
+iD8DBQFDSwD5gIKl8Uu19MoRAgeZAJ4lyYSKMGuRuzv9Q/AD8Hgo4UQsyACfYGln
+iCjRFi79/nSelhvRPotFDkQ=
+=wZYW
 -----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 b7f8e3fab28b..93fbc6968ebf 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.10 2005/10/09 04:47:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.11 2005/10/11 00:00:07 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -227,14 +227,14 @@ toolchain-glibc_src_compile() {
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
 		unset LD_ASSUME_KERNEL
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die
 	fi
 }
 
@@ -304,14 +304,6 @@ toolchain-glibc_src_install() {
 	fi
 
 	if is_crosscompile ; then
-		# Glibc doesn't setup multilib crosscompiled dirs right, but it
-		# sets up native multilib dirs right, so just do this when we
-		# crosscompile.
-		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
-			dodir $(alt_libdir)
-			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
-		fi
-
 		# punt all the junk not needed by a cross-compiler
 		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share}
 	fi
@@ -595,10 +587,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		case ${CTARGET} in
-			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
-			*)	 echo /usr/${CTARGET}/lib ;;
-		esac
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -606,10 +595,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		case ${CTARGET} in
-			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
-			*)	 echo /usr/${CTARGET}/lib ;;
-		esac
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -1087,15 +1073,11 @@ src_unpack() {
 		mips)
 			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch"
 			use_multilib \
-				&& GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch"
+				&& GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \
+				|| GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
 		;;
 	esac
 
-	if ! is_crosscompile || [[ ${CTARGET#mips64} == ${CTARGET} ]] ; then
-		# This patch breaks every other multilib crosscompiler except mips64, and it only partially fixes that.
-		GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
-	fi
-
 	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
 
 	toolchain-glibc_src_unpack