diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r2.ebuild | 10 |
3 files changed, 18 insertions, 8 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index c7d3b29f7c26..59f94e1e6889 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # 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.397 2005/10/08 04:19:36 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.398 2005/10/11 23:55:21 eradicator Exp $ + + 11 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> + glibc-2.3.5-r2.ebuild: + Set MULTILIB_ABIS to DEFAULT_ABI if ! use multilib. 08 Oct 2005; Chris PeBenito <pebenito@gentoo.org> glibc-2.3.5-r1.ebuild, glibc-2.3.5-r2.ebuild: diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 0d868c5a5da4..b3d6ceed2218 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 f3ca5cb66a4e05224e4028f8ddb21c68 ChangeLog 84563 +MD5 4f83e16079744b90100d5e6cc5f8efb1 ChangeLog 84702 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 bd5bf79d303a7365ff19d7021465369d glibc-2.3.5-r1.ebuild 40631 -MD5 aca85f14c46bfc2acbf8a5d29b7215e5 glibc-2.3.5-r2.ebuild 38318 +MD5 300001e7a248154bb712ce4db665d725 glibc-2.3.5-r2.ebuild 38390 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) -iD8DBQFDSwD5gIKl8Uu19MoRAgeZAJ4lyYSKMGuRuzv9Q/AD8Hgo4UQsyACfYGln -iCjRFi79/nSelhvRPotFDkQ= -=wZYW +iD8DBQFDTFD+OpjtAl+gMRURAhM0AJ9LTlNd/vv7fOzwepdlK6pKoRB9RACdFoBA +Ng1Ox70zaRRqmOwaXr+mGsE= +=zCC9 -----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 93fbc6968ebf..c6f28d38a6c2 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.11 2005/10/11 00:00:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.12 2005/10/11 23:55:21 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -966,8 +966,11 @@ fix_lib64_symlinks() { use_multilib() { case ${CTARGET} in + *-uclibc) false ;; + sparc64*|mips64*|amd64|ppc64) - is_crosscompile || has_multilib_profile || use multilib ;; + has_multilib_profile || use multilib ;; + *) false ;; esac } @@ -976,6 +979,9 @@ use_multilib() { setup_env() { if is_crosscompile || tc-is-cross-compiler ; then multilib_env ${CTARGET} + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + fi fi export ABI=${ABI:-${DEFAULT_ABI:-default}} |