Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Thu, 30 Jun 2022 18:16:45
Message-Id: 1656612942.a2d84b5dea75df392e9d4fc093b88c77087fd687.sam@gentoo
1 commit: a2d84b5dea75df392e9d4fc093b88c77087fd687
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 18:15:42 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 18:15:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a2d84b5d
7
8 bootstrap-prefix.sh: crank up Python 3.9 version
9
10 Closes: https://bugs.gentoo.org/843368
11 Closes: https://bugs.gentoo.org/835579
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 scripts/bootstrap-prefix.sh | 9 +++++----
15 1 file changed, 5 insertions(+), 4 deletions(-)
16
17 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
18 index 5670f37bc2..a484eae4d2 100755
19 --- a/scripts/bootstrap-prefix.sh
20 +++ b/scripts/bootstrap-prefix.sh
21 @@ -1035,13 +1035,14 @@ bootstrap_gnu() {
22
23 PYTHONMAJMIN=3.9 # keep this number in line with PV below for stage1,2
24 bootstrap_python() {
25 - PV=3.9.6
26 + PV=3.9.13
27 A=Python-${PV}.tar.xz
28 einfo "Bootstrapping ${A%.tar.*}"
29
30 - # don't really want to put this on the mirror, since they are
31 - # non-vanilla sources, bit specific for us
32 - efetch ${DISTFILES_URL}/${A} || return 1
33 + # Don't really want to put this on the mirror, since they are
34 + # non-vanilla sources, bit specific for us. Ideally use HTTPS / upstream
35 + # but fall back to dev.gentoo.org w/ HTTP (host wget may not suport HTTPS).
36 + efetch https://www.python.org/ftp/python/${PV}/${A} || efetch ${DISTFILES_URL}/${A} || return 1
37
38 einfo "Unpacking ${A%.tar.*}"
39 export S="${PORTAGE_TMPDIR}/python-${PV}"