Don't do get_libdir on crosscompiles except for mips64 since it breaks other targets and only mildly fixes mips64.

Package-Manager: portage-2.0.53_rc3

4 files changed, 30 insertions, 13 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index f806d70754a0..f50bf877645d 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.394 2005/10/07 05:11:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.395 2005/10/07 10:19:06 eradicator Exp $
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:
+  Don't do get_libdir on crosscompiles except for mips64 since it breaks other
+  targets and only mildly fixes mips64.
 
   07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050421.ebuild,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6cb8e74cab7e..d99323f5ff87 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 84eb5deb6033f2ca47039bfe358395c4 ChangeLog 83947
+MD5 d5e663af8f994335f7275ba2d7c5b9bc ChangeLog 84178
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
@@ -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 78d9f5f1108aac4d04aee384374df59a glibc-2.3.5-r2.ebuild 38463
+MD5 0ff772825e86e39acc6f441e3b66fc5f glibc-2.3.5-r2.ebuild 38615
 MD5 5939b81f0fa59cc654755058a684dee7 glibc-2.3.5.20050421.ebuild 40224
-MD5 885bcf76a8b62d59bd9e9590e67d4068 glibc-2.3.5.20050722.ebuild 39219
+MD5 c8b67d0b495ba2ccdc0e67c3f40c76c0 glibc-2.3.5.20050722.ebuild 39371
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDRgOgOpjtAl+gMRURAmVcAKDH4ZfDvVElZVYNb9UXLmZNwZR0DQCgmltz
-ci/kSL/FuEcbXHrWX0UkOEI=
-=fDvj
+iD8DBQFDRkuzOpjtAl+gMRURAjVWAKDR4lEPKbnK8W03lu7OI06OlghNagCeK3jm
+uhV+Vw0ulJ4aLEeBj9s6BUQ=
+=XQ15
 -----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 b5b58d27c47c..f515d4714ea4 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.6 2005/10/07 05:11:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.7 2005/10/07 10:19:06 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -595,7 +595,10 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/$(get_libdir)
+		case ${CTARGET} in
+			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
+			*)	 echo /usr/${CTARGET}/lib ;;
+		esac
 	else
 		echo /$(get_libdir)
 	fi
@@ -603,7 +606,10 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/$(get_libdir)
+		case ${CTARGET} in
+			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
+			*)	 echo /usr/${CTARGET}/lib ;;
+		esac
 	else
 		echo /usr/$(get_libdir)
 	fi
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index df233d424c78..a2e32ad8797d 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.22 2005/10/07 05:11:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.23 2005/10/07 10:19:06 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -598,7 +598,10 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/$(get_libdir)
+		case ${CTARGET} in
+			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
+			*)	 echo /usr/${CTARGET}/lib ;;
+		esac
 	else
 		echo /$(get_libdir)
 	fi
@@ -606,7 +609,10 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/$(get_libdir)
+		case ${CTARGET} in
+			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
+			*)	 echo /usr/${CTARGET}/lib ;;
+		esac
 	else
 		echo /usr/$(get_libdir)
 	fi