From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE746139083 for ; Sun, 17 Dec 2017 21:08:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C2F7E0E68; Sun, 17 Dec 2017 21:08:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F125FE0E68 for ; Sun, 17 Dec 2017 21:08:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F093E33BE68 for ; Sun, 17 Dec 2017 21:08:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 932A8AE7C for ; Sun, 17 Dec 2017 21:08:26 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1513544889.1d4fb2081073508a3b60c62fd7d0f825653d0e61.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/xz-utils-5.2.3.ebuild app-arch/xz-utils/xz-utils-9999.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 1d4fb2081073508a3b60c62fd7d0f825653d0e61 X-VCS-Branch: master Date: Sun, 17 Dec 2017 21:08:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bbbc3b5c-98f4-4adb-96f9-8be8ed6876db X-Archives-Hash: 395c1cddbe09d0cc3d60fcc845c138ab commit: 1d4fb2081073508a3b60c62fd7d0f825653d0e61 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 13 08:07:25 2017 +0000 Commit: Thomas Deutschmann gentoo 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() {