Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Wed, 14 Aug 2019 02:19:10
Message-Id: 1565748613.06756a72592e621c8f071e5d17c5c79136e31155.zmedico@gentoo
1 commit: 06756a72592e621c8f071e5d17c5c79136e31155
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 12 20:58:17 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 02:10:13 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=06756a72
7
8 econf: Unconditionally die on error in EAPIs 0 to 3.
9
10 As specified by PMS: "econf [...] Should any portion of it fail, it
11 must abort the build using die, unless run using nonfatal, in which
12 case it must return non-zero exit status."
13 https://projects.gentoo.org/pms/7/pms.html#x1-12800012.3.8
14
15 Bug: https://bugs.gentoo.org/692024
16 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
17 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
18
19 bin/phase-helpers.sh | 2 ++
20 1 file changed, 2 insertions(+)
21
22 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
23 index 15fe8c682..5f0e202c2 100644
24 --- a/bin/phase-helpers.sh
25 +++ b/bin/phase-helpers.sh
26 @@ -676,6 +676,8 @@ econf() {
27 echo "!!! Please attach the following file when seeking support:"
28 echo "!!! ${PWD}/config.log"
29 fi
30 + # econf dies unconditionally in EAPIs 0 to 3
31 + ___eapi_helpers_can_die || die "econf failed"
32 __helpers_die "econf failed"
33 return 1
34 fi