Skip to content

Commit 71d0118

Browse files
committed
Drop stale patches
1 parent 656b050 commit 71d0118

File tree

3 files changed

+1
-121
lines changed

3 files changed

+1
-121
lines changed

cpython-unix/build-cpython.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ else
9090
patch -p1 -i ${ROOT}/patch-xopen-source-ios-legacy.patch
9191
fi
9292

93-
# See https://github.com/python/cpython/pull/135146
94-
# TODO(zanieb): Drop in 3.14b3
95-
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then
96-
patch -p1 -i ${ROOT}/patch-static-remote-debug-3.14.patch
97-
fi
98-
9993
# LIBTOOL_CRUFT is unused and breaks cross-compiling on macOS. Nuke it.
10094
# Submitted upstream at https://github.com/python/cpython/pull/101048.
10195
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_11}" ]; then
@@ -486,9 +480,7 @@ if [ -n "${CPYTHON_OPTIMIZED}" ]; then
486480

487481
# Respect CFLAGS during JIT compilation.
488482
# Backports https://github.com/python/cpython/pull/134276
489-
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then
490-
patch -p1 -i ${ROOT}/patch-jit-cflags-314.patch
491-
elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
483+
if [[ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" && -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_13}" ]]; then
492484
patch -p1 -i ${ROOT}/patch-jit-cflags-313.patch
493485
fi
494486

cpython-unix/patch-jit-cflags-314.patch

Lines changed: 0 additions & 90 deletions
This file was deleted.

cpython-unix/patch-static-remote-debug-3.14.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)