Skip to content

Commit

Permalink
downloads: upgrade CPython 3.8.12 to 3.8.13
Browse files Browse the repository at this point in the history
This required refreshing a configure patch involving MULTIARCH,
as there were backports to deal with Clang 13.
  • Loading branch information
indygreg committed Mar 18, 2022
1 parent 62042cd commit e27d7b8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 18 deletions.
34 changes: 20 additions & 14 deletions cpython-unix/build-cpython.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,21 @@ EOF
else
patch -p1 <<"EOF"
diff --git a/configure b/configure
index 7cad0e2f98..50212236c4 100755
index c091865aff..0aeea8cedb 100755
--- a/configure
+++ b/configure
@@ -5196,7 +5196,7 @@ $as_echo "$as_me:
@@ -5318,10 +5318,7 @@ $as_echo "none" >&6; }
fi
rm -f conftest.c conftest.out
-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-if test x$PLATFORM_TRIPLET != xdarwin; then
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-fi
-
+MULTIARCH=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
EOF
fi
fi
Expand Down Expand Up @@ -398,18 +401,21 @@ EOF
else
patch -p1 <<"EOF"
diff --git a/configure b/configure
index 7cad0e2f98..50212236c4 100755
index c091865aff..0aeea8cedb 100755
--- a/configure
+++ b/configure
@@ -5196,7 +5196,7 @@ $as_echo "$as_me:
@@ -5318,10 +5318,7 @@ $as_echo "none" >&6; }
fi
-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
rm -f conftest.c conftest.out
-if test x$PLATFORM_TRIPLET != xdarwin; then
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-fi
-
+MULTIARCH=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
EOF
fi
fi
Expand Down
8 changes: 4 additions & 4 deletions pythonbuild/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"version": "3.19.2",
},
"cpython-3.8": {
"url": "https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz",
"size": 18443568,
"sha256": "b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea",
"version": "3.8.12",
"url": "https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz",
"size": 19023016,
"sha256": "6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57",
"version": "3.8.13",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp38",
Expand Down

0 comments on commit e27d7b8

Please sign in to comment.