commit: 1d4fb2081073508a3b60c62fd7d0f825653d0e61
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 08:07:25 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 21:08:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4fb208
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 b074679f0e0..f15ced82058 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 cf2f6076d65..e437466c00f 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() {
