From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 858211382C5 for ; Fri, 5 Jan 2018 11:24:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02C8DE0D0E; Fri, 5 Jan 2018 11:24:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5664E0D0E for ; Fri, 5 Jan 2018 11:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB568335C07 for ; Fri, 5 Jan 2018 11:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45183193 for ; Fri, 5 Jan 2018 11:24:06 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1515151433.e5c8da07a43b0a3af9994ceda31113ccb842db8e.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: e5c8da07a43b0a3af9994ceda31113ccb842db8e X-VCS-Branch: master Date: Fri, 5 Jan 2018 11:24:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b8b62f83-3621-4427-a8a3-c427efa087f9 X-Archives-Hash: 046f0049d7c7e8e1c51e11407fa73432 commit: e5c8da07a43b0a3af9994ceda31113ccb842db8e Author: Fabian Groffen gentoo org> AuthorDate: Fri Jan 5 11:23:53 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jan 5 11:23:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e5c8da07 scripts/bootstrap-prefix: don't rely on bash-4.2 features scripts/bootstrap-prefix.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index e262ffba3d..78c62ea314 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1181,8 +1181,9 @@ bootstrap_stage1() { [[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) || return 1 [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1 [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1 - [[ $(bison --version 2>&1) =~ GNU" "Bison") "(2.[3-7]|[3-9]) ]] \ - || [[ -x ${ROOT}/tmp/usr/bin/bison ]] \ + [[ -x ${ROOT}/tmp/usr/bin/bison ]] \ + || [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \ + || [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \ || (bootstrap_bison) || return 1 [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \ || (bootstrap_coreutils) || return 1