From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1335819-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2EED9158086 for <garchives@archives.gentoo.org>; Tue, 2 Nov 2021 15:36:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 314BCE0823; Tue, 2 Nov 2021 15:36:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65E5AE0823 for <gentoo-commits@lists.gentoo.org>; Tue, 2 Nov 2021 15:36:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2065342CC8 for <gentoo-commits@lists.gentoo.org>; Tue, 2 Nov 2021 15:36:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56D53D0 for <gentoo-commits@lists.gentoo.org>; Tue, 2 Nov 2021 15:36:14 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1635867238.fb744a61aa7008a80ae0a3d0b9fbde8a1fe99aa7.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fb744a61aa7008a80ae0a3d0b9fbde8a1fe99aa7 X-VCS-Branch: master Date: Tue, 2 Nov 2021 15:36:14 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d56bb06-3d70-4948-a06f-aa5b41c86c34 X-Archives-Hash: add9558284c1332e99d3e3020a2f14fb commit: fb744a61aa7008a80ae0a3d0b9fbde8a1fe99aa7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 2 15:33:58 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 2 15:33:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fb744a61 scripts/bootstrap-prefix.sh: adapt for macOS 12 Monterey Signed-off-by: Sam James <sam <AT> gentoo.org> scripts/bootstrap-prefix.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 0e21c83953..11a042315b 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -382,15 +382,25 @@ bootstrap_setup() { rev=${CHOST##*darwin} profile="prefix/darwin/macos/10.$((rev - 4))/x64" ;; - x86_64-apple-darwin2[0123456789]) + x86_64-apple-darwin20) # Big Sur is 11.0 rev=${CHOST##*darwin} profile="prefix/darwin/macos/11.$((rev - 20))/x64" ;; - arm64-apple-darwin2[0123456789]) + x86_64-apple-darwin2[123456789]) + # Monterey is 12.0 + rev=${CHOST##*darwin} + profile="prefix/darwin/macos/12.$((rev - 20))/x64" + ;; + arm64-apple-darwin20) rev=${CHOST##*darwin} profile="prefix/darwin/macos/11.$((rev - 20))/arm64" ;; + x86_64-apple-darwin2[123456789]) + # Monterey is 12.0 + rev=${CHOST##*darwin} + profile="prefix/darwin/macos/12.$((rev - 20))/x64" + ;; i*86-pc-linux-gnu) profile=${profile_linux/ARCH/x86} ;;