mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
toolchain-binutils.eclass: handle zlib better across multiple versions #591516
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user