Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Tue, 02 Nov 2021 15:36:20
Message-Id: 1635867238.fb744a61aa7008a80ae0a3d0b9fbde8a1fe99aa7.sam@gentoo
1 commit: fb744a61aa7008a80ae0a3d0b9fbde8a1fe99aa7
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 2 15:33:58 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 2 15:33:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fb744a61
7
8 scripts/bootstrap-prefix.sh: adapt for macOS 12 Monterey
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 scripts/bootstrap-prefix.sh | 14 ++++++++++++--
13 1 file changed, 12 insertions(+), 2 deletions(-)
14
15 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
16 index 0e21c83953..11a042315b 100755
17 --- a/scripts/bootstrap-prefix.sh
18 +++ b/scripts/bootstrap-prefix.sh
19 @@ -382,15 +382,25 @@ bootstrap_setup() {
20 rev=${CHOST##*darwin}
21 profile="prefix/darwin/macos/10.$((rev - 4))/x64"
22 ;;
23 - x86_64-apple-darwin2[0123456789])
24 + x86_64-apple-darwin20)
25 # Big Sur is 11.0
26 rev=${CHOST##*darwin}
27 profile="prefix/darwin/macos/11.$((rev - 20))/x64"
28 ;;
29 - arm64-apple-darwin2[0123456789])
30 + x86_64-apple-darwin2[123456789])
31 + # Monterey is 12.0
32 + rev=${CHOST##*darwin}
33 + profile="prefix/darwin/macos/12.$((rev - 20))/x64"
34 + ;;
35 + arm64-apple-darwin20)
36 rev=${CHOST##*darwin}
37 profile="prefix/darwin/macos/11.$((rev - 20))/arm64"
38 ;;
39 + x86_64-apple-darwin2[123456789])
40 + # Monterey is 12.0
41 + rev=${CHOST##*darwin}
42 + profile="prefix/darwin/macos/12.$((rev - 20))/x64"
43 + ;;
44 i*86-pc-linux-gnu)
45 profile=${profile_linux/ARCH/x86}
46 ;;