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, 01 Jan 2021 12:36:08
Message-Id: 1609504423.0a3b74f39934e6ed3c46a48096205880818bdb94.grobian@gentoo
1 commit: 0a3b74f39934e6ed3c46a48096205880818bdb94
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 12:33:43 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 12:33:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0a3b74f3
7
8 scripts/bootstrap-prefix: install gnuconfig first thing
9
10 this is in particular useful on arm64-macos where the CHOST triple isn't
11 known, but won't hurt for other targets
12
13 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
14
15 scripts/bootstrap-prefix.sh | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
19 index 2de55682af..ea77baae8d 100755
20 --- a/scripts/bootstrap-prefix.sh
21 +++ b/scripts/bootstrap-prefix.sh
22 @@ -224,7 +224,7 @@ configure_toolchain() {
23 compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
24 compiler_type="clang"
25 local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
26 - local llvm_deps="dev-util/ninja sys-devel/gnuconfig"
27 + local llvm_deps="dev-util/ninja"
28 case "${ccvers}" in
29 *"Apple clang version "*|*"Apple LLVM version "*)
30 # this is Clang, recent enough to compile recent clang
31 @@ -1779,6 +1779,7 @@ bootstrap_stage2() {
32
33 # Build a basic compiler and portage dependencies in $ROOT/tmp.
34 pkgs=(
35 + sys-devel/gnuconfig
36 sys-apps/gentoo-functions
37 app-portage/elt-patches
38 $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency