summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-18 19:51:55 +0000
committerMike Frysinger <vapier@gentoo.org>2011-03-18 19:51:55 +0000
commit5c1ebea3f13cda843a4c95c6c4e9f7bfb51a786d (patch)
treef16e4b5e2928970c7eca250d7c56335ae4c3ca30 /eclass/toolchain-binutils.eclass
parent~x86 per bug 355353 (diff)
downloadhistorical-5c1ebea3f13cda843a4c95c6c4e9f7bfb51a786d.tar.gz
historical-5c1ebea3f13cda843a4c95c6c4e9f7bfb51a786d.tar.bz2
historical-5c1ebea3f13cda843a4c95c6c4e9f7bfb51a786d.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/toolchain-binutils.eclass')
-rw-r--r--eclass/toolchain-binutils.eclass6
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" \