From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1597643-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 DA05715815E
for <garchives@archives.gentoo.org>; Mon, 5 Feb 2024 19:31:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 15C9FE2A5A;
Mon, 5 Feb 2024 19:31:39 +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 ED29DE2A5A
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Feb 2024 19:31:38 +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 EC8CE3430A2
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Feb 2024 19:31:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 82A8F358
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Feb 2024 19:31:36 +0000 (UTC)
From: "Fabian Groffen" <grobian@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, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1707161421.472b8f58661c072823b086a0ce29431b9b724ad1.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: 472b8f58661c072823b086a0ce29431b9b724ad1
X-VCS-Branch: master
Date: Mon, 5 Feb 2024 19:31:36 +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: 30f19fd1-3608-4251-bbce-616c8928d0e8
X-Archives-Hash: fa8cd71ac728e9f85db36bc7486d96e9
commit: 472b8f58661c072823b086a0ce29431b9b724ad1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 19:30:21 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 19:30:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=472b8f58
scripts/bootstrap-prefix: bring back Darwin 9 x86 support
Use ppc-macos as base for this, as it's just an aid.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5f6d8b7db4..c59ff0cd9c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -299,6 +299,16 @@ bootstrap_setup() {
echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
[[ ${OFFLINE_MODE} ]] && \
echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
+
+ if [[ ${CHOST} == i*86-apple-darwin9 ]] ; then
+ # There's no legitimate reason to use 10.5 with x86 (10.6 and
+ # 10.7 run on every device that ever ran 10.5 x86) but it's
+ # vastly easier to access and faster than ppc. Don't want to
+ # burden the tree with this aid-arch, so just use the ppc
+ # keyword.
+ echo
+ echo 'ACCEPT_KEYWORDS="~ppc-macos"'
+ fi
} > "${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf"
fi
@@ -357,6 +367,10 @@ bootstrap_profile() {
rev=${CHOST##*darwin}
profile="prefix/darwin/macos/10.$((rev - 4))/ppc"
;;
+ i*86-apple-darwin9)
+ rev=${CHOST##*darwin}
+ profile="prefix/darwin/macos/10.$((rev - 4))/x32"
+ ;;
i*86-apple-darwin1[578])
eerror "REMOVED ARCH: this 32-bit MacOS architecture was removed,"
eerror "bootstrapping is impossible"