aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-08-30 05:25:33 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-08-30 05:29:37 (GMT)
commit7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705 (patch)
treeb7cafacf447b99ce2afc625bee4987e1fdd8629e
parentEAPI 5: User patches (no-op dummy stub for now) (diff)
downloadportage-7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.zip
portage-7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.tar.gz
portage-7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.tar.bz2
EAPI 5: econf --disable-silent-rules
See bug #379497 and the PMS patch: http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=b7750e67b4772c1064543defb7df6a556f09807b
-rw-r--r--bin/phase-helpers.sh28
1 files changed, 23 insertions, 5 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 3230870..db1548e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -421,11 +421,29 @@ econf() {
fi
# EAPI=4 adds --disable-dependency-tracking to econf
- if ! has "$EAPI" 0 1 2 3 && \
- "${ECONF_SOURCE}/configure" --help 2>/dev/null | \
- grep -q disable-dependency-tracking ; then
- set -- --disable-dependency-tracking "$@"
- fi
+ case "${EAPI}" in
+ 0|1|2|3)
+ ;;
+ *)
+ local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)
+ case "${conf_help}" in
+ *--disable-dependency-tracking*)
+ set -- --disable-dependency-tracking "$@"
+ ;;
+ esac
+ case "${EAPI}" in
+ 4|4-python|4-slot-abi)
+ ;;
+ *)
+ case "${conf_help}" in
+ *--disable-silent-rules*)
+ set -- --disable-silent-rules "$@"
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
# if the profile defines a location to install libs to aside from default, pass it on.
# if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.