On Fri, 25 Jul 2014 01:11:47 +0300 Sergei Trofimovich <sly...@gentoo.org> wrote:
ping :]
> 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 <sly...@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
> --
> 2.0.0
>
--
Sergei
signature.asc
Description: PGP signature
