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 9EE1B15800F for ; Wed, 22 Feb 2023 07:44:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3AFDE069C; Wed, 22 Feb 2023 07:44:47 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CF2EE069C for ; Wed, 22 Feb 2023 07:44:47 +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 DCC6B3402FE for ; Wed, 22 Feb 2023 07:44:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B2DE75 for ; Wed, 22 Feb 2023 07:44:45 +0000 (UTC) From: "Sam James" 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" Message-ID: <1677051880.b2820767f0a995c1330a6168a77cda45577255f0.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: b2820767f0a995c1330a6168a77cda45577255f0 X-VCS-Branch: master Date: Wed, 22 Feb 2023 07:44:45 +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: c8b24bf4-f454-43e2-b2f1-5ffa270eb2f0 X-Archives-Hash: 3d618048da2ed8042f78a68c3c6e4b84 commit: b2820767f0a995c1330a6168a77cda45577255f0 Author: Peter Foley pefoley com> AuthorDate: Wed Feb 22 04:04:36 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 22 07:44:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b2820767 Fix prefix python bootstrap for cygwin Upstream cygwin doesn't ship python 3.10 yet, and the patches in the 3.9 tarball don't apply cleanly. As a consequence, cygwin bootstrap has been broken since fd1c9f9b6b838173e6f7df0cb8cc5114e55f6c56. Fix this by using 3.9 to bootstrap for cygwin only. Bug: https://bugs.gentoo.org/852665 Signed-off-by: Peter Foley pefoley.com> Closes: https://github.com/gentoo/prefix/pull/18 Signed-off-by: Sam James gentoo.org> scripts/bootstrap-prefix.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 857017581a..1ba5108ce1 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -997,9 +997,18 @@ bootstrap_gnu() { einfo "${A%.tar.*} successfully bootstrapped" } +if [[ ${CHOST} == *-cygwin* ]] ; then +PYTHONMAJMIN=3.9 # keep this number in line with PV below for stage1,2 +else PYTHONMAJMIN=3.10 # keep this number in line with PV below for stage1,2 +fi + bootstrap_python() { - PV=3.10.4 + if [[ ${CHOST} == *-cygwin* ]] ; then + PV=3.9.9 + else + PV=3.10.4 + fi A=Python-${PV}.tar.xz einfo "Bootstrapping ${A%.tar.*}"