Gentoo Archives: gentoo-commits

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Fri, 05 Oct 2018 15:28:26
Message-Id: 1538753293.413545cbf257d578db2d9bbc787f049be94542a1.haubi@gentoo
1 commit: 413545cbf257d578db2d9bbc787f049be94542a1
2 Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 5 15:28:13 2018 +0000
4 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 5 15:28:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=413545cb
7
8 bootstrap-prefix.sh (stage1): bump to Python-2.7.15.tar.xz for AIX
9
10 scripts/bootstrap-prefix.sh | 12 +++++++++---
11 1 file changed, 9 insertions(+), 3 deletions(-)
12
13 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
14 index bb25d293de..dc3f37bf78 100755
15 --- a/scripts/bootstrap-prefix.sh
16 +++ b/scripts/bootstrap-prefix.sh
17 @@ -832,7 +832,8 @@ bootstrap_python() {
18 case $CHOST in
19 *-*-aix*)
20 # TODO: freebsd 10 also seems to need this
21 - A=Python-${PV}.tar.bz2 # patched one breaks
22 + PV=2.7.15
23 + A=Python-${PV}.tar.xz # patched one breaks
24 patch=true
25 ;;
26 *)
27 @@ -852,7 +853,12 @@ bootstrap_python() {
28 rm -rf "${S}"
29 mkdir -p "${S}"
30 cd "${S}"
31 - bzip2 -dc "${DISTDIR}"/${A} | tar -xf - || return 1
32 + case ${A} in
33 + *bz2) bzip2 -dc "${DISTDIR}"/${A} | tar -xf - ;;
34 + *xz) xz -dc "${DISTDIR}"/${A} | tar -xf - ;;
35 + *) einfo "Don't know to unpack ${A}" ;;
36 + esac
37 + [[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
38 S="${S}"/Python-${PV}
39 cd "${S}"
40 rm -rf Modules/_ctypes/libffi* || return 1
41 @@ -861,7 +867,7 @@ bootstrap_python() {
42 if ${patch}; then
43 # This patch is critical and needs to be applied even
44 # when using the otherwise unpatched sources.
45 - efetch "http://dev.gentoo.org/~redlizard/distfiles/02_all_disable_modules_and_ssl.patch"
46 + efetch "http://dev.gentoo.org/~haubi/distfiles/02_all_disable_modules_and_ssl.patch"
47 patch -p0 < "${DISTDIR}"/02_all_disable_modules_and_ssl.patch
48 fi