diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-11 00:06:16 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-11 00:06:16 +0000 |
| commit | 40c39e36d7f59c15544ede961fc74c3e4517bcb1 (patch) | |
| tree | b634dadae8cb02ac4b33005317590e1ba11bdcd9 /sys-libs | |
| parent | New release (0.10.4) (diff) | |
| download | historical-40c39e36d7f59c15544ede961fc74c3e4517bcb1.tar.gz historical-40c39e36d7f59c15544ede961fc74c3e4517bcb1.tar.bz2 historical-40c39e36d7f59c15544ede961fc74c3e4517bcb1.zip | |
Fix sparc crosscompile confusing sparc/sparc64. Closes bug #84405.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d715d100f430..c51f71159917 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -11,7 +11,7 @@ MD5 ab06008394eb7c6aa17a674cae788eef glibc-2.3.4.20041102.ebuild 32888 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418 MD5 695f1e83d1cb212d83d97f0d2989cb94 glibc-2.3.4.20050125.ebuild 35240 -MD5 a4bf84c9b8e553f0305f827ce1ddac8d glibc-2.3.4.20050125-r1.ebuild 37442 +MD5 fda83f7de7976c3ec4f09da42ec5c8db glibc-2.3.4.20050125-r1.ebuild 37455 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 @@ -145,7 +145,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCMM5AArHZZzCEUG0RAoJDAJ0Ywdh2uNAxHm/bL6wso7gCWQ3nRACeKG6b -iKHpYpRHvmDXmPIIJzeBisw= -=fhWu +iD8DBQFCMOESArHZZzCEUG0RAq+UAJ9xNxZVEUp5vAEG4hETOlBw4JdwxACfR4Iz +mcwOYmYZrRgiMBRI7il7SVY= +=spQd -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild index 157d2427eb48..97c33b0f7351 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125-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.4.20050125-r1.ebuild,v 1.21 2005/03/10 22:46:13 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.22 2005/03/11 00:06:16 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -925,8 +925,8 @@ crosscompile_setup() { local VAR="CFLAGS_"${CTARGET//-/_} CFLAGS=${!VAR-"-O2"} - case $(tc-arch) in - amd64) + case ${CTARGET} in + x86_64*) export CFLAGS_x86="${CFLAGS_x86--m32}" export CHOST_x86="i686-pc-linux-gnu" export CDEFINE_x86="__i386__" @@ -940,7 +940,7 @@ crosscompile_setup() { export MULTILIB_ABIS="amd64" export DEFAULT_ABI="amd64" ;; - mips) + mips64*) export CFLAGS_o32="${CFLAGS_o32--mabi=32}" export CHOST_o32="mips-unknown-linux-gnu" export CDEFINE_o32="_ABIO32" @@ -959,7 +959,7 @@ crosscompile_setup() { export MULTILIB_ABIS="n64 n32" export DEFAULT_ABI="n32" ;; - ppc64) + powerpc64*) export CFLAGS_ppc="${CFLAGS_ppc--m32}" export CHOST_ppc="powerpc-unknown-linux-gnu" export CDEFINE_ppc="" @@ -975,7 +975,7 @@ crosscompile_setup() { die "ppc64 crosscompile not yet supported. Bug a ppc64 dev to fill in the CDEFINE values in the glibc ebuild." ;; - sparc) + sparc64*) export CFLAGS_sparc32="${CFLAGS_sparc--m32}" export CHOST_sparc32="sparc-unknown-linux-gnu" export CDEFINE_sparc32="!__arch64__" |