From 1d4fb2081073508a3b60c62fd7d0f825653d0e61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 13 Dec 2017 09:07:25 +0100 Subject: [PATCH] app-arch/xz-utils: Refactor myconf for new options --- app-arch/xz-utils/xz-utils-5.2.3.ebuild | 14 +++++++++----- app-arch/xz-utils/xz-utils-9999.ebuild | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild index b074679f0e09..f15ced82058d 100644 --- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild @@ -45,12 +45,16 @@ src_prepare() { } multilib_src_configure() { + local myconf=( + $(use_enable nls) + $(use_enable threads) + $(use_enable static-libs static) + ) + multilib_is_native_abi || + myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} ) + use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714 - ECONF_SOURCE="${S}" econf \ - $(use_enable nls) \ - $(use_enable threads) \ - $(use_enable static-libs static) \ - $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}) + ECONF_SOURCE="${S}" econf "${myconf[@]}" } multilib_src_install() { diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index cf2f6076d65b..e437466c00f9 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -45,12 +45,16 @@ src_prepare() { } multilib_src_configure() { + local myconf=( + $(use_enable nls) + $(use_enable threads) + $(use_enable static-libs static) + ) + multilib_is_native_abi || + myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} ) + use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714 - ECONF_SOURCE="${S}" econf \ - $(use_enable nls) \ - $(use_enable threads) \ - $(use_enable static-libs static) \ - $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}) + ECONF_SOURCE="${S}" econf "${myconf[@]}" } multilib_src_install() { -- 2.26.2