Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Sun, 10 Sep 2017 05:39:40
Message-Id: 1505021793.8b80d2fa2d1cf77cd3ee1d31daa1017912fc596b.heroxbd@gentoo
1 commit: 8b80d2fa2d1cf77cd3ee1d31daa1017912fc596b
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 10 05:34:18 2017 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 10 05:36:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8b80d2fa
7
8 bootstrap-prefix.sh: require >=bash-4.2 to be available in stage2.
9
10 Many essential ebuilds, like app-portage/elt-patches are at EAPI=6,
11 which requires bash-4.2 to function.
12
13 scripts/bootstrap-prefix.sh | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
17 index d5ed16e814..c300b5ac07 100755
18 --- a/scripts/bootstrap-prefix.sh
19 +++ b/scripts/bootstrap-prefix.sh
20 @@ -1225,7 +1225,7 @@ bootstrap_stage1() {
21 [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] || (bootstrap_patch) || return 1
22 [[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
23 [[ $(awk --version < /dev/null 2>&1) == *GNU* ]] || bootstrap_gawk || return 1
24 - [[ $(bash --version 2>&1) == "GNU bash, version 4."[123456789]* && ${CHOST} != *-aix* ]] \
25 + [[ $(bash --version 2>&1) == "GNU bash, version 4."[23456789]* && ${CHOST} != *-aix* ]] \
26 || [[ -x ${ROOT}/tmp/usr/bin/bash ]] \
27 || (bootstrap_bash) || return 1
28 type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1