[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     8c1495faa17c824d18ca53e263703431f8d19117
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 08:11:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 09:04:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1495fa

toolchain-binutils.eclass: Don't use bundled zlib (bug #591516).

 eclass/toolchain-binutils.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 46e972a..2445a72 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