diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-10 11:06:05 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-10 11:06:05 +0000 |
| commit | 5432df6372217215860fc4b42fafed461a1c3433 (patch) | |
| tree | 640c927ed1a131bfa954ad3f7b3d289fe4429d86 /sys-libs | |
| parent | Version bumped. (diff) | |
| download | historical-5432df6372217215860fc4b42fafed461a1c3433.tar.gz historical-5432df6372217215860fc4b42fafed461a1c3433.tar.bz2 historical-5432df6372217215860fc4b42fafed461a1c3433.zip | |
Remove is_crosscompile from amd64 magic as it doesn't quite work (returns true when building the 32bit part of the native libc).
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125.ebuild | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 1dbf1bc5923b..f9bcec999fd3 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -10,7 +10,7 @@ MD5 63f67cbcb98920a75ba0b1a4b781519c glibc-2.3.4.20040808-r1.ebuild 27601 MD5 96dc89a3ebadd5f1260ce517ffe6fef3 glibc-2.3.4.20041102.ebuild 32955 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418 -MD5 4d121eaaa62ab6b71780f05ea0ee0143 glibc-2.3.4.20050125.ebuild 32219 +MD5 7ef99d6e9359b37087ed7d9051b4d01d glibc-2.3.4.20050125.ebuild 32158 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 @@ -143,7 +143,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCCvRwArHZZzCEUG0RAq21AJ9pJOvJKKizyfWkUGsKiKiwJZAlJgCghx5J -D9b2y7aHmM7zNa2bdvqtlAI= -=Qpi4 +iD8DBQFCC0AoArHZZzCEUG0RAqvXAJ9FJq8mYtgH1FwwbgVWGU/dAzOdZwCfUgbY +0QBt9UUv5ClTaS8J9S4D68s= +=IvJD -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild index 8be87bcfe52f..5f2927a4c435 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125.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.ebuild,v 1.6 2005/02/10 05:42:52 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.7 2005/02/10 11:06:05 eradicator Exp $ KEYWORDS="~amd64 ~mips ~sparc ~x86" @@ -1054,15 +1054,16 @@ src_install() { ABI=${ABI:-default} # Handle stupid lib32 BS - if [ "$(tc-arch)" = "amd64" -a "${ABI}" = "x86" -a "$(get_libdir)" != "lib" ] && ! is_crosscompile; then + unset OLD_LIBDIR + if [ "$(tc-arch)" = "amd64" -a "${ABI}" = "x86" -a "$(get_libdir)" != "lib" ]; then OLD_LIBDIR="$(get_libdir)" LIBDIR_x86="lib" fi toolchain-glibc_src_install - # Handle stupid lib32 BS - if [ "$(tc-arch)" = "amd64" -a "${ABI}" = "x86" -a -n "${OLD_LIBDIR}" ] && ! is_crosscompile; then + # Handle stupid lib32 BS on amd64 + if [ -n "${OLD_LIBDIR}" ]; then LIBDIR_x86="${OLD_LIBDIR}" unset OLD_LIBDIR |