From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E05B41386F3 for ; Wed, 12 Aug 2015 10:38:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C352A141A5; Wed, 12 Aug 2015 10:38:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A786141A5 for ; Wed, 12 Aug 2015 10:38:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 398D9340A59 for ; Wed, 12 Aug 2015 10:38:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36DBD150 for ; Wed, 12 Aug 2015 10:38:20 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1439375890.1c3e65403d006ea25f98e6405486fa1201e9d173.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.0.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 1c3e65403d006ea25f98e6405486fa1201e9d173 X-VCS-Branch: master Date: Wed, 12 Aug 2015 10:38:20 +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: b7f3df7e-8352-4c4d-be60-b9e6e676585f X-Archives-Hash: 039c40bf3581f9923b4fbd3cffb51f5a commit: 1c3e65403d006ea25f98e6405486fa1201e9d173 Author: Mike Frysinger gentoo org> AuthorDate: Wed Aug 12 10:27:00 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Aug 12 10:38:10 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3e6540 sys-libs/ncurses: rework disabling of progs Since the configure script has an option to disable progs, leverage that instead of whiting out a random make variable. It's the same result, but feels cleaner and requires less code. sys-libs/ncurses/ncurses-6.0.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild index 8a055bf..08d4b73 100644 --- a/sys-libs/ncurses/ncurses-6.0.ebuild +++ b/sys-libs/ncurses/ncurses-6.0.ebuild @@ -115,6 +115,7 @@ do_configure() { $(use_enable !debug leaks) $(use_with debug expanded) $(use_with !debug macros) + $(multilib_native_with progs) $(use_with test tests) $(use_with trace) $(use_with tinfo termlib) @@ -130,22 +131,20 @@ src_compile() { # because people often don't keep matching host/target # ncurses versions #249363 if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then - make_flags="-C progs tic" - BUILD_DIR="${HOSTTIC_DIR}" do_compile cross + BUILD_DIR="${HOSTTIC_DIR}" do_compile cross -C progs tic fi multilib-minimal_src_compile } multilib_src_compile() { - make_flags="" - multilib_is_native_abi || make_flags="PROGS= " do_compile narrowc use unicode && do_compile widec } do_compile() { cd "${BUILD_DIR}"-$1 || die + shift # A little hack to fix parallel builds ... they break when # generating sources so if we generate the sources first (in @@ -158,7 +157,7 @@ do_compile() { # Manually delete the pc-files file so the install step will # create the .pc files we want. rm -f misc/pc-files - emake ${make_flags} + emake "$@" } multilib_src_install() {