diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-07 14:04:34 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-07 14:04:34 -0700 |
| commit | 9168d4c184a16e9b992e22bb5d6f3d88b25309b9 (patch) | |
| tree | 3c027c3bd9e528ad279d5dd5cf45a2782244bdac /bin/phase-helpers.sh | |
| parent | 76fcf8c48671e970169de6ae025d7a0a2e75a8a9 (diff) | |
| download | portage-9168d4c184a16e9b992e22bb5d6f3d88b25309b9.tar.gz portage-9168d4c184a16e9b992e22bb5d6f3d88b25309b9.tar.bz2 portage-9168d4c184a16e9b992e22bb5d6f3d88b25309b9.zip | |
Revert "econf: add --disable-silent-rules, bug #379497#c6"
This reverts commit 1cc39de72ac5311db748341ef9183586556719d9.
It may be unsafe to call configure --help with some configure scripts,
as noted in bug #379497, comment #34.
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 480e73e08..946520b20 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -420,17 +420,11 @@ econf() { done fi - local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null) - - case "${conf_help}" in - *--disable-silent-rules*) set -- --disable-silent-rules "$@";; - esac - # EAPI=4 adds --disable-dependency-tracking to econf - if ! has "$EAPI" 0 1 2 3 3_pre2 ; then - case "${conf_help}" in - *--disable-dependency-tracking*) set -- --disable-dependency-tracking "$@";; - esac + if ! has "$EAPI" 0 1 2 3 3_pre2 && \ + "${ECONF_SOURCE}/configure" --help 2>/dev/null | \ + grep -q disable-dependency-tracking ; then + set -- --disable-dependency-tracking "$@" fi # if the profile defines a location to install libs to aside from default, pass it on. |