Skip to content

Commit dc5f445

Browse files
committed
fixup! fixup! fixup! fixup! Add Python 3.14
1 parent 7894411 commit dc5f445

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

cpython-unix/build-cpython.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ cat Makefile.extra
7272
pushd Python-${PYTHON_VERSION}
7373

7474
# configure doesn't support cross-compiling on Apple. Teach it.
75-
if [ "${PYTHON_MAJMIN_VERSION}" = "3.13" ]; then
75+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
7676
patch -p1 -i ${ROOT}/patch-apple-cross-3.13.patch
7777
elif [ "${PYTHON_MAJMIN_VERSION}" = "3.12" ]; then
7878
patch -p1 -i ${ROOT}/patch-apple-cross-3.12.patch
@@ -786,7 +786,7 @@ s390x-unknown-linux-gnu)
786786
x86_64-unknown-linux-*)
787787
# In Python 3.13+, the musl target is identified in cross compiles and the output directory
788788
# is named accordingly.
789-
if [ "${CC}" = "musl-clang" ] && [ "${PYTHON_MAJMIN_VERSION}" = "3.13" ]; then
789+
if [ "${CC}" = "musl-clang" ] && [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
790790
PYTHON_ARCH="x86_64-linux-musl"
791791
else
792792
PYTHON_ARCH="x86_64-linux-gnu"

cpython-unix/extension-modules.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,18 @@ _bisect:
1919
- _bisectmodule.c
2020

2121
_blake2:
22-
sources:
23-
- _blake2/blake2module.c
24-
- _blake2/blake2b_impl.c
25-
- _blake2/blake2s_impl.c
22+
includes-conditional:
23+
- path: Modules/_hacl/include
24+
minimum-python-version: "3.14"
25+
sources-conditional:
26+
- source: _blake2/blake2module.c
27+
maximum-python-version: "3.13"
28+
- source: _blake2/blake2b_impl.c
29+
maximum-python-version: "3.13"
30+
- source: _blake2/blake2s_impl.c
31+
maximum-python-version: "3.13"
32+
- source: blake2module.c
33+
minimum-python-version: "3.14"
2634

2735
_bz2:
2836
sources:

0 commit comments

Comments
 (0)