diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-11-15 01:46:31 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-11-15 01:51:23 -0500 |
| commit | dd3431dcd1c50f6dcbd543792d0b8cdc2808da47 (patch) | |
| tree | bdcbbfd2f1b356e9be00f8016d7db96f7da8fc08 /eclass | |
| parent | dev-ruby/rcairo: add 1.15.3 (diff) | |
| download | gentoo-dd3431dcd1c50f6dcbd543792d0b8cdc2808da47.tar.gz gentoo-dd3431dcd1c50f6dcbd543792d0b8cdc2808da47.tar.bz2 gentoo-dd3431dcd1c50f6dcbd543792d0b8cdc2808da47.zip | |
toolchain-binutils.eclass: handle zlib better across multiple versions #591516
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain-binutils.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 2445a722b7be..a16eab7d90c8 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -89,13 +89,17 @@ else LICENSE="|| ( GPL-2 LGPL-2 )" fi IUSE="cxx multitarget nls static-libs test vanilla" -if ! version_is_at_least 2.26 ; then +if version_is_at_least 2.19 && ! version_is_at_least 2.26 ; then IUSE+=" zlib" fi SLOT="${BVER}" RDEPEND=">=sys-devel/binutils-config-3" -in_iuse zlib && RDEPEND+=" zlib? ( sys-libs/zlib )" +if in_iuse zlib ; then + RDEPEND+=" zlib? ( sys-libs/zlib )" +elif version_is_at_least 2.26 ; then + RDEPEND+=" sys-libs/zlib" +fi DEPEND="${RDEPEND} test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) @@ -263,7 +267,7 @@ 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 + elif version_is_at_least 2.26 ; then myconf+=( --with-system-zlib ) fi |