add mips to the nptl list and make sure we pass --without-fp for softfloat targets

Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 35494f215398447ab032b483034f8141682985e8..bff4bc6aba34ff980d95e345eb90b4e557ed17b9 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -6,7 +6,7 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
-MD5 c8392cd03f6f74e56ee5773da168baec glibc-2.3.5-r1.ebuild 40357
+MD5 bf07a6c1499114fb15d42fe4b56db236 glibc-2.3.5-r1.ebuild 40438
 MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 73fc10b9878bccc90533b031bbfb7996 glibc-2.3.5.20050722.ebuild 40400
@@ -135,7 +135,7 @@ MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDOy5FgIKl8Uu19MoRAvWeAJ9etXlPUkRMrlb28FjA4whvuBovhACdEhm/
-Bk2mGi3ZXZxKvoApKjlyvOY=
-=mCp+
+iD8DBQFDPG03gIKl8Uu19MoRAvUwAJ9PwnrW2pgZ7bhn/iRv4QNW0zPr4ACeO4nZ
+weRk0LHvFzBvkh/Cdo2f1hs=
+=N5y0
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index af0886f186575e7dcd34cd3578389c71f2eb3055..680abe8d6dd09b05d9556ca58838f1da84bbd41d 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r1.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-r1.ebuild,v 1.38 2005/09/28 23:57:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.39 2005/09/29 22:38:45 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -752,7 +752,7 @@ want_nptl() {
 
        # Archs that can use NPTL
        case $(tc-arch) in
-               alpha|amd64|ia64|ppc|ppc64|s390|x86)
+               alpha|amd64|ia64|mips|ppc|ppc64|s390|x86)
                        return 0;
                ;;
                sparc)
@@ -774,7 +774,7 @@ want_linuxthreads() {
 want_tls() {
        # Archs that can use TLS (Thread Local Storage)
        case $(tc-arch) in
-               alpha|amd64|ia64|ppc|ppc64|s390)
+               alpha|amd64|ia64|mips|ppc|ppc64|s390)
                        return 0;
                ;;
                sparc)
@@ -859,6 +859,8 @@ glibc_do_configure() {
 
        use glibc-omitfp && myconf="${myconf} --enable-omitfp"
 
+       [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
+
        if [ "$1" == "linuxthreads" ] ; then
                if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
                        myconf="${myconf} --with-tls"