commit:     06756a72592e621c8f071e5d17c5c79136e31155
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 20:58:17 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 02:10:13 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=06756a72

econf: Unconditionally die on error in EAPIs 0 to 3.

As specified by PMS: "econf [...] Should any portion of it fail, it
must abort the build using die, unless run using nonfatal, in which
case it must return non-zero exit status."
https://projects.gentoo.org/pms/7/pms.html#x1-12800012.3.8

Bug: https://bugs.gentoo.org/692024
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 bin/phase-helpers.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 15fe8c682..5f0e202c2 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -676,6 +676,8 @@ econf() {
                                echo "!!! Please attach the following file when 
seeking support:"
                                echo "!!! ${PWD}/config.log"
                        fi
+                       # econf dies unconditionally in EAPIs 0 to 3
+                       ___eapi_helpers_can_die || die "econf failed"
                        __helpers_die "econf failed"
                        return 1
                fi

Reply via email to