Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Fri, 05 Jan 2018 11:24:09
Message-Id: 1515151433.e5c8da07a43b0a3af9994ceda31113ccb842db8e.grobian@gentoo
1 commit: e5c8da07a43b0a3af9994ceda31113ccb842db8e
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 5 11:23:53 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 5 11:23:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e5c8da07
7
8 scripts/bootstrap-prefix: don't rely on bash-4.2 features
9
10 scripts/bootstrap-prefix.sh | 5 +++--
11 1 file changed, 3 insertions(+), 2 deletions(-)
12
13 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
14 index e262ffba3d..78c62ea314 100755
15 --- a/scripts/bootstrap-prefix.sh
16 +++ b/scripts/bootstrap-prefix.sh
17 @@ -1181,8 +1181,9 @@ bootstrap_stage1() {
18 [[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) || return 1
19 [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
20 [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
21 - [[ $(bison --version 2>&1) =~ GNU" "Bison") "(2.[3-7]|[3-9]) ]] \
22 - || [[ -x ${ROOT}/tmp/usr/bin/bison ]] \
23 + [[ -x ${ROOT}/tmp/usr/bin/bison ]] \
24 + || [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
25 + || [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
26 || (bootstrap_bison) || return 1
27 [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
28 || (bootstrap_coreutils) || return 1