Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Fri, 01 Jul 2022 06:30:31
Message-Id: 1656657008.23e04465be51d3e2156981bf9851a4bd3163e96c.grobian@gentoo
1 commit: 23e04465be51d3e2156981bf9851a4bd3163e96c
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 1 06:30:08 2022 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 1 06:30:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=23e04465
7
8 scripts/bootstrap-prefix: cleanup bootstrap_python somewhat
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 scripts/bootstrap-prefix.sh | 7 ++-----
13 1 file changed, 2 insertions(+), 5 deletions(-)
14
15 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
16 index 127d91aca7..2a28478970 100755
17 --- a/scripts/bootstrap-prefix.sh
18 +++ b/scripts/bootstrap-prefix.sh
19 @@ -1039,10 +1039,7 @@ bootstrap_python() {
20 A=Python-${PV}.tar.xz
21 einfo "Bootstrapping ${A%.tar.*}"
22
23 - # Don't really want to put this on the mirror, since they are
24 - # non-vanilla sources, bit specific for us. Ideally use HTTPS / upstream
25 - # but fall back to dev.gentoo.org w/ HTTP (host wget may not suport HTTPS).
26 - efetch https://www.python.org/ftp/python/${PV}/${A} || efetch ${DISTFILES_URL}/${A} || return 1
27 + efetch https://www.python.org/ftp/python/${PV}/${A}
28
29 einfo "Unpacking ${A%.tar.*}"
30 export S="${PORTAGE_TMPDIR}/python-${PV}"
31 @@ -1195,7 +1192,7 @@ bootstrap_python() {
32 einfo "Compiling ${A%.tar.*}"
33
34 # - Some ancient versions of hg fail with "hg id -i", so help
35 - # configure to not find them using HAS_HG
36 + # configure to not find them using HAS_HG (TODO: obsolete?)
37 # - Do not find libffi via pkg-config using PKG_CONFIG
38 HAS_HG=no \
39 PKG_CONFIG= \