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 4169013877A for ; Tue, 19 Aug 2014 08:16:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF612E093A; Tue, 19 Aug 2014 08:16:52 +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 74CADE0940 for ; Tue, 19 Aug 2014 08:16:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68D5B3401A7 for ; Tue, 19 Aug 2014 08:16:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 641DE3BBA for ; Tue, 19 Aug 2014 07:01:05 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1407627707.49ec4696f0d933957c75b8ecc0f775bc79c78010.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/emake bin/phase-helpers.sh X-VCS-Directories: bin/ebuild-helpers/ bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 49ec4696f0d933957c75b8ecc0f775bc79c78010 X-VCS-Branch: master Date: Tue, 19 Aug 2014 07:01:05 +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: b47446e8-d73d-4d72-ae88-dfc7059432c9 X-Archives-Hash: eb73b76ae0df8d87d4ba6bb1285077f1 commit: 49ec4696f0d933957c75b8ecc0f775bc79c78010 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Jul 24 22:11:47 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 9 23:41:47 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=49ec4696 emake: pass EXTRA_EMAKE after user's "$@", not before Patch allows easier override or ebuild things, like #foo-9999.ebuild: src_compile() { emake V=1 } EXTRA_EMAKE="V=0" emerge =foo-9999 That way it's easier to eyeball upstream builds for new warnings. This behaviour is more in line with EXTRA_ECONF variable. Signed-off-by: Sergei Trofimovich gentoo.org> --- bin/ebuild-helpers/emake | 4 ++-- bin/phase-helpers.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/ebuild-helpers/emake b/bin/ebuild-helpers/emake index 69d836f..4618053 100755 --- a/bin/ebuild-helpers/emake +++ b/bin/ebuild-helpers/emake @@ -13,7 +13,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ $PORTAGE_QUIET != 1 ]] ; then ( - for arg in ${MAKE:-make} $MAKEOPTS $EXTRA_EMAKE "$@" ; do + for arg in ${MAKE:-make} $MAKEOPTS "$@" $EXTRA_EMAKE ; do [[ ${arg} == *" "* ]] \ && printf "'%s' " "${arg}" \ || printf "%s " "${arg}" @@ -22,7 +22,7 @@ if [[ $PORTAGE_QUIET != 1 ]] ; then ) >&2 fi -${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@" +${MAKE:-make} ${MAKEOPTS} "$@" ${EXTRA_EMAKE} ret=$? [[ $ret -ne 0 ]] && __helpers_die "${0##*/} failed" exit $ret diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 412decb..47bd843 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -617,8 +617,8 @@ einstall() { mandir="${ED}usr/share/man" \ sysconfdir="${ED}etc" \ ${LOCAL_EXTRA_EINSTALL} \ - ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ - "$@" install + ${MAKEOPTS} -j1 \ + "$@" ${EXTRA_EMAKE} install fi ${MAKE:-make} prefix="${ED}usr" \ datadir="${ED}usr/share" \ @@ -627,8 +627,8 @@ einstall() { mandir="${ED}usr/share/man" \ sysconfdir="${ED}etc" \ ${LOCAL_EXTRA_EINSTALL} \ - ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ - "$@" install || die "einstall failed" + ${MAKEOPTS} -j1 \ + "$@" ${EXTRA_EMAKE} install || die "einstall failed" else die "no Makefile found" fi