Exclude 5005_all_enable-multilib-with-cross-compile.patch unless we're building a...

Package-Manager: portage-2.0.53_rc4

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index f50bf877645d5709f62cf20e19d6fd63f97fb878..f08ee592b5a3e10a0f0c632ba2faf74a0de27753 100644 (file)
--- 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.395 2005/10/07 10:19:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.396 2005/10/08 00:33:59 eradicator Exp $
+
+  08 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r2.ebuild:
+  Exclude 5005_all_enable-multilib-with-cross-compile.patch unless we're
+  building a mips64 crosscompiler as it breaks everything else.
 
   07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild:

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d99323f5ff87e6ff673245eab6b8e25dc88e4817..bc0f04e5f1ce55b5a4abd7da477a599bb0f6afb3 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d5e663af8f994335f7275ba2d7c5b9bc ChangeLog 84178
+MD5 0772f3e80fc42c82df1c4e6aece73e67 ChangeLog 84398
 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,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 f9ecdb0b89b5b8a0667a86d40dfbc9c9 glibc-2.3.5-r1.ebuild 40292
-MD5 0ff772825e86e39acc6f441e3b66fc5f glibc-2.3.5-r2.ebuild 38615
+MD5 fd82bedbd7ef7c0f0e311dea9c4e99ee glibc-2.3.5-r2.ebuild 38557
 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)
 
-iD8DBQFDRkuzOpjtAl+gMRURAjVWAKDR4lEPKbnK8W03lu7OI06OlghNagCeK3jm
-uhV+Vw0ulJ4aLEeBj9s6BUQ=
-=XQ15
+iD8DBQFDRxQKOpjtAl+gMRURAsiZAKDaSVV4bmQF2b7lG//Sh7DHK6KXCACgsU7o
+3N5hWBvIhDulxwPINDnn3BY=
+=ge9m
 -----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 f515d4714ea41c1267bc7b1b0d006061ff519493..48476a252a6cf68a3efe299101a2474d800db3ac 100644 (file)
--- 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.7 2005/10/07 10:19:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.8 2005/10/08 00:33:59 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1074,17 +1074,15 @@ 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} 5005_all_enable-multilib-with-cross-compile.patch"
-               ;;
-               amd64)
-                       if ! has_multilib_profile && ! is_crosscompile ; then
-                               # the gentoo-libdir patch hack conflicts with these
-                               GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
-                       fi
+                               && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.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