From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1515268-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 B109815ACFC
for <garchives@archives.gentoo.org>; Thu, 4 May 2023 13:39:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CD31DE0801;
Thu, 4 May 2023 13:39:32 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AEEB0E0801
for <gentoo-commits@lists.gentoo.org>; Thu, 4 May 2023 13:39:32 +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 89406340BF1
for <gentoo-commits@lists.gentoo.org>; Thu, 4 May 2023 13:39:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2359A8E4
for <gentoo-commits@lists.gentoo.org>; Thu, 4 May 2023 13:39:30 +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: <1683207513.c5acc17d94e4f034776ea6cf1ff70ce06f815f91.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: c5acc17d94e4f034776ea6cf1ff70ce06f815f91
X-VCS-Branch: master
Date: Thu, 4 May 2023 13:39:30 +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: a2fea741-c10f-4b70-887e-fc5df43fef8e
X-Archives-Hash: e1d7fecbd10fc67cfdcc784bccdbf2f6
commit: c5acc17d94e4f034776ea6cf1ff70ce06f815f91
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May 4 13:38:33 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 4 13:38:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c5acc17d
scripts/bootstrap-prefix: drop Solaris NM override, use Python 3.10 again
Python 3.11 doesn't work on Solaris, use 3.10 it doesn't matter for
stage1 for as long as Portage runs anyway.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de4f70201f..4610358c0d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -291,11 +291,6 @@ configure_toolchain() {
compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev-libs/mpfr-4 "}
;;
esac
- local nmout=$(nm -B 2>&1)
- case "${nmout}" in
- */dev/null*) : ;; # apparently GNU
- *) export NM="$(type -P nm) -p" ;; # Solaris nm
- esac
;;
*-linux*)
is-rap && einfo "Triggering Linux RAP bootstrap"
@@ -1001,7 +996,7 @@ python_ver() {
if [[ ${CHOST} == *-cygwin* ]] ; then
echo 3.9 # keep this number in line with PV below for stage1,2
else
- echo 3.11 # keep this number in line with PV below for stage1,2
+ echo 3.10 # keep this number in line with PV below for stage1,2
fi
}
@@ -1009,7 +1004,7 @@ bootstrap_python() {
if [[ ${CHOST} == *-cygwin* ]] ; then
PV=$(python_ver).10
else
- PV=$(python_ver).3
+ PV=$(python_ver).4
fi
A=Python-${PV}.tar.xz
einfo "Bootstrapping ${A%.tar.*}"