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 5F1EE159C96 for ; Tue, 23 Jul 2024 06:35:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71DB7E29E5; Tue, 23 Jul 2024 06:35:36 +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 4B9FBE29E5 for ; Tue, 23 Jul 2024 06:35:36 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E5B1335CB4 for ; Tue, 23 Jul 2024 06:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B6C812CA for ; Tue, 23 Jul 2024 06:35:33 +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: <1721716255.0378ad858efe139d123cf92d769bfe95ce6b34fc.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: 0378ad858efe139d123cf92d769bfe95ce6b34fc X-VCS-Branch: master Date: Tue, 23 Jul 2024 06:35:33 +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: b19a1477-a919-45e0-89cf-82d7a6ac301a X-Archives-Hash: 6e7adb14a89d3f6fcd8ef5c76d592b8d commit: 0378ad858efe139d123cf92d769bfe95ce6b34fc Author: Fabian Groffen gentoo org> AuthorDate: Tue Jul 23 06:30:55 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jul 23 06:30:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0378ad85 scripts/bootstrap-prefix: emulate readlink -f behaviour for older macOS Avoid some ugly warning and fallback to (likely) wrong SDK with failures as result due to not expanding the MacOSX.sdk symlink properly. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 07ce71168c..9dfa1cda47 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -548,7 +548,7 @@ bootstrap_tree() { # retain this comment and the line below to # keep this snapshot around in the snapshots # MKSNAPSHOT-ANCHOR -- directory of rsync slaves - local PV="20240718" + local PV="20240721" # RAP uses the latest gentoo main repo snapshot to bootstrap. is-rap && LATEST_TREE_YES=1 @@ -1503,7 +1503,14 @@ bootstrap_stage1() { local fsdk local osvers # try and find a matching OS SDK - fsdk="$(readlink -f "${SDKPATH}")" + fsdk="$(readlink "${SDKPATH}")" + # note readlink -f is not supported on older versions of + # macOS so need to emulate it + if [[ ${fsdk} != /* ]] ; then + # this is not proper, but Apple does not use ../ + # constructs here, as far as we know + fsdk="${SDKPATH%/*}/${fsdk}" + fi osvers="$(sw_vers -productVersion)" if [[ ${osvers%%.*} -le 10 ]] ; then osvers=$(echo "${osvers}" | cut -d'.' -f1-2)