From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1337862-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 B572C158086
	for <garchives@archives.gentoo.org>; Tue,  9 Nov 2021 05:58:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A834D2BC085;
	Tue,  9 Nov 2021 05:58:49 +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) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 14FA52BC085
	for <gentoo-commits@lists.gentoo.org>; Tue,  9 Nov 2021 05:58:48 +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 CE458342D65
	for <gentoo-commits@lists.gentoo.org>; Tue,  9 Nov 2021 05:58:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CFEC9EA
	for <gentoo-commits@lists.gentoo.org>; Tue,  9 Nov 2021 05:58:45 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1636437408.c7a36d05a3ef1850bb4e4edcaedae88ec1b263ba.sam@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: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c7a36d05a3ef1850bb4e4edcaedae88ec1b263ba
X-VCS-Branch: master
Date: Tue,  9 Nov 2021 05:58:45 +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: a551bb67-5d89-43fc-8fb9-2f920aec4f42
X-Archives-Hash: 1b0adb22227f19e838b1e5dea3be3c61

commit:     c7a36d05a3ef1850bb4e4edcaedae88ec1b263ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 05:56:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 05:56:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c7a36d05

scripts/bootstrap-prefix.sh: swap to Python 3.9 for bootstrap

1. ::gentoo defaults to Python 3.9 for quite some time (and
   going against the profile defaults leads to possible
   missing deps/hiccups).

2. This seems to help with some failures when poking at
   Clang-based bootstrap for macOS/Darwin.

Succesfully bootstrapped on x86_64-apple-darwin21-gcc.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 825aa87c5e..e1ceee9d37 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -979,9 +979,9 @@ bootstrap_gnu() {
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
-PYTHONMAJMIN=3.8   # keep this number in line with PV below for stage1,2
+PYTHONMAJMIN=3.9   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.8.6
+	PV=3.9.6
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
@@ -1047,8 +1047,8 @@ bootstrap_python() {
 			-e 's/KQUEUE/KQUEUE_DISABLED/' \
 			configure
 		# fixup thread id detection
-		efetch "http://dev.gentoo.org/~grobian/distfiles/python-3.8.6-darwin9.patch"
-		patch -p1 < "${DISTDIR}"/python-3.8.6-darwin9.patch
+		efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
+		patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
 		;;
 	(arm64-*-darwin*)
 		# Teach Python a new trick (arm64)