| 1 |
Patch allows easier override or ebuild things, like |
| 2 |
#foo-9999.ebuild: |
| 3 |
src_compile() { |
| 4 |
emake V=1 |
| 5 |
} |
| 6 |
|
| 7 |
EXTRA_EMAKE="V=0" emerge =foo-9999 |
| 8 |
|
| 9 |
That way it's easier to eyeball upstream builds for new warnings. |
| 10 |
|
| 11 |
This behaviour is more in line with EXTRA_ECONF variable. |
| 12 |
|
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 14 |
--- |
| 15 |
bin/ebuild-helpers/emake | 4 ++-- |
| 16 |
bin/phase-helpers.sh | 8 ++++---- |
| 17 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/bin/ebuild-helpers/emake b/bin/ebuild-helpers/emake |
| 20 |
index 69d836f..4618053 100755 |
| 21 |
--- a/bin/ebuild-helpers/emake |
| 22 |
+++ b/bin/ebuild-helpers/emake |
| 23 |
@@ -13,7 +13,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 24 |
|
| 25 |
if [[ $PORTAGE_QUIET != 1 ]] ; then |
| 26 |
( |
| 27 |
- for arg in ${MAKE:-make} $MAKEOPTS $EXTRA_EMAKE "$@" ; do |
| 28 |
+ for arg in ${MAKE:-make} $MAKEOPTS "$@" $EXTRA_EMAKE ; do |
| 29 |
[[ ${arg} == *" "* ]] \ |
| 30 |
&& printf "'%s' " "${arg}" \ |
| 31 |
|| printf "%s " "${arg}" |
| 32 |
@@ -22,7 +22,7 @@ if [[ $PORTAGE_QUIET != 1 ]] ; then |
| 33 |
) >&2 |
| 34 |
fi |
| 35 |
|
| 36 |
-${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@" |
| 37 |
+${MAKE:-make} ${MAKEOPTS} "$@" ${EXTRA_EMAKE} |
| 38 |
ret=$? |
| 39 |
[[ $ret -ne 0 ]] && __helpers_die "${0##*/} failed" |
| 40 |
exit $ret |
| 41 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 42 |
index 412decb..47bd843 100644 |
| 43 |
--- a/bin/phase-helpers.sh |
| 44 |
+++ b/bin/phase-helpers.sh |
| 45 |
@@ -617,8 +617,8 @@ einstall() { |
| 46 |
mandir="${ED}usr/share/man" \ |
| 47 |
sysconfdir="${ED}etc" \ |
| 48 |
${LOCAL_EXTRA_EINSTALL} \ |
| 49 |
- ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ |
| 50 |
- "$@" install |
| 51 |
+ ${MAKEOPTS} -j1 \ |
| 52 |
+ "$@" ${EXTRA_EMAKE} install |
| 53 |
fi |
| 54 |
${MAKE:-make} prefix="${ED}usr" \ |
| 55 |
datadir="${ED}usr/share" \ |
| 56 |
@@ -627,8 +627,8 @@ einstall() { |
| 57 |
mandir="${ED}usr/share/man" \ |
| 58 |
sysconfdir="${ED}etc" \ |
| 59 |
${LOCAL_EXTRA_EINSTALL} \ |
| 60 |
- ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ |
| 61 |
- "$@" install || die "einstall failed" |
| 62 |
+ ${MAKEOPTS} -j1 \ |
| 63 |
+ "$@" ${EXTRA_EMAKE} install || die "einstall failed" |
| 64 |
else |
| 65 |
die "no Makefile found" |
| 66 |
fi |
| 67 |
-- |
| 68 |
2.0.0 |
Archives