diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-09-26 22:13:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-26 22:13:20 +0000 |
| commit | 471e15a8d7c0134ab25ebd40a28bb44ab65d5bd9 (patch) | |
| tree | 11ff9526f53cb53d7141c7cb5b0fefd068ecee71 /sys-libs | |
| parent | Add rpath stuff, bug #100597. Fix epiphany/galeon/etc segfaulting at startup. (diff) | |
| download | historical-471e15a8d7c0134ab25ebd40a28bb44ab65d5bd9.tar.gz historical-471e15a8d7c0134ab25ebd40a28bb44ab65d5bd9.tar.bz2 historical-471e15a8d7c0134ab25ebd40a28bb44ab65d5bd9.zip | |
exclude 5005_all_enable-multilib-with-cross-compile.patch when using the gentoo-libdir multilib hack #107286
Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r1.ebuild | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 5edd54d8238c..3952adc7f7e5 100644 --- 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 36efe2f96d5649aa048925e15c84258d glibc-2.3.5-r1.ebuild 40083 +MD5 fd27362b55ca22db1e96f02663e88c4e glibc-2.3.5-r1.ebuild 40315 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) -iD8DBQFDNNQ2gIKl8Uu19MoRAvT4AJ9u5vJNGk9yNPZmvbgMJ7sU+bItBACfZ9xm -lcOQUWQ0PRPD3qKGOf1ata4= -=wd1m +iD8DBQFDOHK1gIKl8Uu19MoRAt9AAJ9WsiQQpPqHfgYHwv+aBlUSkgIPoACfWD9s +IiNWTq/nW8GnLhYJZXxruqc= +=fzFo -----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 ddbc517bd86f..09a79a9320a0 100644 --- 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.34 2005/09/24 04:20:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.35 2005/09/26 22:13:20 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1124,6 +1124,12 @@ src_unpack() { && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \ || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch" ;; + amd64) + if ! has_multilib_profile && ! is_crosscompile ; then + # the gentoo-libdir patch hack conflicts with these + GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch" + fi + ;; esac GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch" |