From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1656003-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 521C9159C96
for <garchives@archives.gentoo.org>; Thu, 25 Jul 2024 11:17:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7C04DE2A80;
Thu, 25 Jul 2024 11:17:10 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5A12FE2A80
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Jul 2024 11:17:10 +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 536F73406A2
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Jul 2024 11:17:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8348B1B89
for <gentoo-commits@lists.gentoo.org>; Thu, 25 Jul 2024 11:17:07 +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: <1721906164.a39343a48782999fcf03a80cc7c7a90609faaa17.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: a39343a48782999fcf03a80cc7c7a90609faaa17
X-VCS-Branch: master
Date: Thu, 25 Jul 2024 11:17:07 +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: 84d5e725-9e7a-4675-b8eb-b6ab77225e4c
X-Archives-Hash: 1ec28196f608fde86f0e8b0f3db1a1fc
commit: a39343a48782999fcf03a80cc7c7a90609faaa17
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 11:16:04 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 11:16:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a39343a4
scripts/bootstrap-prefix: use isainfo to pick up current arch
uname -p on Solaris will return historical values, so use isainfo to get
the currently targetted architecture
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index eb89fa4847..e434b1c61d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3409,10 +3409,16 @@ if [[ -z ${CHOST} ]]; then
fi
;;
SunOS)
- case $(uname -p) in
+ case $(isainfo -n) in
+ amd64)
+ CHOST="x86_64-pc-solaris$(uname -r | sed 's|5|2|')"
+ ;;
i386)
CHOST="i386-pc-solaris$(uname -r | sed 's|5|2|')"
;;
+ sparcv9)
+ CHOST="sparcv9-sun-solaris$(uname -r | sed 's|5|2|')"
+ ;;
sparc)
CHOST="sparc-sun-solaris$(uname -r | sed 's|5|2|')"
;;