diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 22:25:33 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 22:29:37 -0700 |
| commit | 7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705 (patch) | |
| tree | b7cafacf447b99ce2afc625bee4987e1fdd8629e /bin/phase-helpers.sh | |
| parent | 6b4b621f1abcf21d3bfa54b323126a3ef11eb52c (diff) | |
| download | portage-7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.tar.gz portage-7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.tar.bz2 portage-7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.zip | |
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
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 3230870c2..db1548ee2 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. |