Don't do o32 for mips64 multilib for now.

Package-Manager: portage-2.0.53_rc5

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 79653d12292c0edbc75565dc9bdef6a1bb1ddfd3..11f7ccad2a813d79f836f4aaf53df35e6d90f7da 100644 (file)
--- 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 5eeb3fe6a71b64a081e642ffb08c0cbe glibc-2.3.4.20041102-r2.ebuild 41281
 MD5 9bc40ac03e72b63652f67be3dcecc184 glibc-2.3.4.20050125-r1.ebuild 39474
 MD5 5348d2828d213442a4c0d6e49b0f58be glibc-2.3.5-r1.ebuild 40537
-MD5 6c8fefc0d2ee664b1da8d0c52bdff9ac glibc-2.3.5-r2.ebuild 38609
+MD5 b15c1d3425ad2c3a8271d6d73d52b808 glibc-2.3.5-r2.ebuild 38696
 MD5 1cb57f1757c26c0e0286cb0ef6c36171 glibc-2.3.5.20050421.ebuild 40152
 MD5 48b60115273ba9fa755a6ef94fe8c3b6 glibc-2.3.5.20050722.ebuild 39299
 MD5 9c15c32a0bbef91769c4fd0c0d7a66c3 glibc-2.3.5.ebuild 40143
@@ -137,7 +137,7 @@ MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDVoqtOpjtAl+gMRURAlppAKDdqq+nVRJ/sC/DLjA4FRZL0Y1rugCfcqCY
-E7r4zQhaKzDeYiM2btJHPD0=
-=nfgr
+iD8DBQFDVrRXOpjtAl+gMRURAutlAJ9NSj56PaaZfQaPBSIe31QlvmdFJgCeN3mc
+kw5QyNQL941uFeOdKMvS4as=
+=o4lR
 -----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 be7c0cc54e2463e660a8d526d5261af566b27dd4..cd32b67cd5c12e51ee10524555de188f4ff8faf7 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.17 2005/10/19 18:02:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.18 2005/10/19 21:00:35 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -979,6 +979,10 @@ setup_env() {
                multilib_env ${CTARGET}
                if ! use multilib ; then
                        MULTILIB_ABIS=${DEFAULT_ABI}
+               else
+                       case ${CTARGET} in
+                       mips64*) MULTILIB_ABIS=${MULTILIB_ABIS/o32} ;;
+                       esac
                fi
        fi