summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2016-10-17 10:11:21 +0200
committerLars Wendler <polynomial-c@gentoo.org>2016-10-17 11:04:32 +0200
commit8c1495faa17c824d18ca53e263703431f8d19117 (patch)
tree551090d3833427828f561814d30315620fb0bf97
parentmedia-libs/gexiv2: Bump to version 0.10.4 (diff)
downloadgentoo-8c1495faa17c824d18ca53e263703431f8d19117.tar.gz
gentoo-8c1495faa17c824d18ca53e263703431f8d19117.tar.bz2
gentoo-8c1495faa17c824d18ca53e263703431f8d19117.zip
toolchain-binutils.eclass: Don't use bundled zlib (bug #591516).
-rw-r--r--eclass/toolchain-binutils.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 46e972a87805..2445a722b7be 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -89,7 +89,7 @@ else
LICENSE="|| ( GPL-2 LGPL-2 )"
fi
IUSE="cxx multitarget nls static-libs test vanilla"
-if version_is_at_least 2.19 ; then
+if ! version_is_at_least 2.26 ; then
IUSE+=" zlib"
fi
SLOT="${BVER}"
@@ -263,6 +263,8 @@ toolchain-binutils_src_configure() {
# older versions did not have an explicit configure flag
export ac_cv_search_zlibVersion=$(usex zlib -lz no)
myconf+=( $(use_with zlib) )
+ else
+ myconf+=( --with-system-zlib )
fi
# For bi-arch systems, enable a 64bit bfd. This matches