Skip to content

Commit bf37889

Browse files
committed
Revert
1 parent 0e5d81a commit bf37889

File tree

6 files changed

+32
-381
lines changed

6 files changed

+32
-381
lines changed

.github/workflows/apple.yml

-253
This file was deleted.

.github/workflows/windows.yml

-110
This file was deleted.

build-macos.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3.12
1+
#!/usr/bin/env python3
22
# This Source Code Form is subject to the terms of the Mozilla Public
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at https://mozilla.org/MPL/2.0/.

cpython-unix/build-cpython.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,20 @@ else
179179
patch -p1 -i ${ROOT}/patch-ctypes-callproc-legacy.patch
180180
fi
181181

182+
# On Windows, CPython looks for the Tcl/Tk libraries relative to the base prefix,
183+
# with we want. But on Unix, it doesn't. This patch applies similar behavior on Unix,
184+
# thereby ensuring that the Tcl/Tk libraries are found in the correct location.
185+
# A similar patch could be applied to other CPython versions, but would require
186+
# customizations for each minor.
187+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
188+
patch -p1 -i ${ROOT}/patch-tkinter.patch
189+
fi
190+
182191
# Code that runs at ctypes module import time does not work with
183192
# non-dynamic binaries. Patch Python to work around this.
184193
# See https://bugs.python.org/issue37060.
185194
patch -p1 -i ${ROOT}/patch-ctypes-static-binary.patch
186195

187-
patch -p1 -i ${ROOT}/patch-tkinter.patch
188-
189196
# Older versions of Python need patching to work with modern mpdecimal.
190197
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_9}" ]; then
191198
patch -p1 -i ${ROOT}/patch-decimal-modern-mpdecimal.patch

0 commit comments

Comments
 (0)