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.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 9D2A7158020 for ; Wed, 2 Nov 2022 08:03:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4EEDE09E3; Wed, 2 Nov 2022 08:03:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8499E09E3 for ; Wed, 2 Nov 2022 08:03:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D014C340D81 for ; Wed, 2 Nov 2022 08:03:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34B1D55B for ; Wed, 2 Nov 2022 08:03:48 +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: <1667376156.c43a5bf0d00d3cb2a0452c35b5c42bf4fc4cfc9f.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: c43a5bf0d00d3cb2a0452c35b5c42bf4fc4cfc9f X-VCS-Branch: master Date: Wed, 2 Nov 2022 08:03:48 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 50b7a71a-079e-42b0-ad04-84fea9a67e54 X-Archives-Hash: 45f4bb42d0f6531e51f605c847358617 commit: c43a5bf0d00d3cb2a0452c35b5c42bf4fc4cfc9f Author: Fabian Groffen gentoo org> AuthorDate: Wed Nov 2 08:02:36 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Nov 2 08:02:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c43a5bf0 scripts/bootstrap-prefix: Darwin fixes - die when xcode-select needs to be run - create proper profiles for Big Sur and later Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 4795d87ee5..ff23367616 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -395,30 +395,17 @@ bootstrap_setup() { rev=${CHOST##*darwin} profile="prefix/darwin/macos/10.$((rev - 4))/x64" ;; - x86_64-apple-darwin20) + *64-apple-darwin2[0123456789]) # Big Sur is 11.0 - rev=${CHOST##*darwin} - profile="prefix/darwin/macos/11.$((rev - 20))/x64" - ;; - x86_64-apple-darwin2[123456789]) - # Monterey is 12.0 - rev=${CHOST##*darwin} - profile="prefix/darwin/macos/12.$((rev - 21))/x64" - ;; - arm64-apple-darwin20) - rev=${CHOST##*darwin} - profile="prefix/darwin/macos/11.$((rev - 20))/arm64" - ;; - # TODO: Come up with something better for macOS 11+ - x86_64-apple-darwin2[123456789]) # Monterey is 12.0 + # Ventura is 13.0 rev=${CHOST##*darwin} - profile="prefix/darwin/macos/12.$((rev - 21))/x64" - ;; - arm64-apple-darwin2[123456789]) - # Monterey is 12.0 - rev=${CHOST##*darwin} - profile="prefix/darwin/macos/12.$((rev - 21))/arm64" + case ${CHOST%%-*} in + x86_64) arch=x64 ;; + arm64) arch=arm64 ;; + *) arch=error ;; + esac + profile="prefix/darwin/macos/$((rev - 9)).0/${arch}" ;; i*86-pc-linux-gnu) profile=${profile_linux/ARCH/x86} @@ -2631,6 +2618,7 @@ continue. Please execute: xcode-select -s /Library/Developer/CommandLineTools and try running me again. EOF + exit 1 fi else # let's see if we have an xcode install @@ -2642,6 +2630,7 @@ valid install. Try resetting it using: sudo xcode-select -r and try running me again. EOF + exit 1 fi fi fi