diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-18 19:51:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-18 19:51:55 +0000 |
| commit | f3cee4b2c3a068f40057b8848577573d28b40fc0 (patch) | |
| tree | 06804d37721cabc7f32127d66803366f320b8505 /eclass | |
| parent | ~x86 per bug 355353 (diff) | |
| download | gentoo-2-f3cee4b2c3a068f40057b8848577573d28b40fc0.tar.gz gentoo-2-f3cee4b2c3a068f40057b8848577573d28b40fc0.tar.bz2 gentoo-2-f3cee4b2c3a068f40057b8848577573d28b40fc0.zip | |
exclude the amd64 lib32 linker patch when SYMLINK_LIB is disabled as it is only needed when lib32 is in use
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain-binutils.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 169edb2f64cc..7081f88504c2 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.97 2011/03/10 04:28:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.98 2011/03/18 19:51:55 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # @@ -113,11 +113,13 @@ tc-binutils_apply_patches() { cd "${S}" if ! use vanilla ; then + EPATCH_EXCLUDE= + [[ ${SYMLINK_LIB} != "yes" ]] && EPATCH_EXCLUDE+=" 65_all_binutils-*-amd64-32bit-path.patch" if [[ -n ${PATCHVER} ]] ; then EPATCH_SOURCE=${WORKDIR}/patch if [[ ${CTARGET} == mips* ]] ; then # remove gnu-hash for mips (bug #233233) - EPATCH_EXCLUDE="77_all_generate-gnu-hash.patch" + EPATCH_EXCLUDE+=" 77_all_generate-gnu-hash.patch" fi [[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \ && EPATCH_SUFFIX="patch.bz2" \ |