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 | c131ec4b2342260be9ed7b4ce363e56b3bdbd919 (patch) | |
| tree | fb87eef023b0f667ca9eaab87c77a628f97acb39 /sys-libs | |
| parent | Add rpath stuff, bug #100597. Fix epiphany/galeon/etc segfaulting at startup. (diff) | |
| download | gentoo-2-c131ec4b2342260be9ed7b4ce363e56b3bdbd919.tar.gz gentoo-2-c131ec4b2342260be9ed7b4ce363e56b3bdbd919.tar.bz2 gentoo-2-c131ec4b2342260be9ed7b4ce363e56b3bdbd919.zip | |
exclude 5005_all_enable-multilib-with-cross-compile.patch when using the gentoo-libdir multilib hack #107286
(Portage version: 2.0.52-r1 http://www.bash.org/?136501 )
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r1.ebuild | 8 |
1 files changed, 7 insertions, 1 deletions
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" |