diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-16 11:33:30 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-16 11:33:30 +0000 |
| commit | f30550a7e39c1042ae4da0c10289da63a5d9e0c5 (patch) | |
| tree | 9ecc7207f80e079cb9690cba3676bc3cad1a46c8 /sys-libs | |
| parent | Initial commit. Thanks to soulse in bug 84895 for the ebuild. (diff) | |
| download | gentoo-2-f30550a7e39c1042ae4da0c10289da63a5d9e0c5.tar.gz gentoo-2-f30550a7e39c1042ae4da0c10289da63a5d9e0c5.tar.bz2 gentoo-2-f30550a7e39c1042ae4da0c10289da63a5d9e0c5.zip | |
Exclude the gcc4 patch if we're not using gcc4
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild | 4 |
1 files changed, 3 insertions, 1 deletions
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 eaaf125959db..0b52f3104cf7 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.25 2005/03/16 06:12:26 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.26 2005/03/16 11:33:30 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1091,6 +1091,8 @@ src_unpack() { use nomalloccheck || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch" + [[ $(gcc-major-version) == "4" ]] || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5040_all_2.3.4-gcc4.patch" + toolchain-glibc_src_unpack case $(tc-arch) in |