Skip to content

Commit e27d7b8

Browse files
committed
downloads: upgrade CPython 3.8.12 to 3.8.13
This required refreshing a configure patch involving MULTIARCH, as there were backports to deal with Clang 13.
1 parent 62042cd commit e27d7b8

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

cpython-unix/build-cpython.sh

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,21 @@ EOF
100100
else
101101
patch -p1 <<"EOF"
102102
diff --git a/configure b/configure
103-
index 7cad0e2f98..50212236c4 100755
103+
index c091865aff..0aeea8cedb 100755
104104
--- a/configure
105105
+++ b/configure
106-
@@ -5196,7 +5196,7 @@ $as_echo "$as_me:
106+
@@ -5318,10 +5318,7 @@ $as_echo "none" >&6; }
107107
fi
108+
rm -f conftest.c conftest.out
108109
109-
110-
-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
110+
-if test x$PLATFORM_TRIPLET != xdarwin; then
111+
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
112+
-fi
113+
-
111114
+MULTIARCH=
112115
113-
114-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
116+
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
117+
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
115118
EOF
116119
fi
117120
fi
@@ -398,18 +401,21 @@ EOF
398401
else
399402
patch -p1 <<"EOF"
400403
diff --git a/configure b/configure
401-
index 7cad0e2f98..50212236c4 100755
404+
index c091865aff..0aeea8cedb 100755
402405
--- a/configure
403406
+++ b/configure
404-
@@ -5196,7 +5196,7 @@ $as_echo "$as_me:
407+
@@ -5318,10 +5318,7 @@ $as_echo "none" >&6; }
405408
fi
406-
407-
408-
-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
409+
rm -f conftest.c conftest.out
410+
411+
-if test x$PLATFORM_TRIPLET != xdarwin; then
412+
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
413+
-fi
414+
-
409415
+MULTIARCH=
410-
411-
412-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
416+
417+
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
418+
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
413419
EOF
414420
fi
415421
fi

pythonbuild/downloads.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
"version": "3.19.2",
5454
},
5555
"cpython-3.8": {
56-
"url": "https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz",
57-
"size": 18443568,
58-
"sha256": "b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea",
59-
"version": "3.8.12",
56+
"url": "https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz",
57+
"size": 19023016,
58+
"sha256": "6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57",
59+
"version": "3.8.13",
6060
"licenses": ["Python-2.0", "CNRI-Python"],
6161
"license_file": "LICENSE.cpython.txt",
6262
"python_tag": "cp38",

0 commit comments

Comments
 (0)