Skip to content

Commit b4140e8

Browse files
committed
Update patch to 3.11.9.
1 parent d55e39e commit b4140e8

File tree

2 files changed

+8602
-2081
lines changed

2 files changed

+8602
-2081
lines changed

Makefile

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BUILD_NUMBER=custom
1515
# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
1616
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
1717
# PYTHON_VER is the major/minor version (e.g., 3.10)
18-
PYTHON_VERSION=3.11.6
18+
PYTHON_VERSION=3.11.9
1919
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
2020
PYTHON_VER=$(basename $(PYTHON_VERSION))
2121

@@ -25,9 +25,10 @@ PYTHON_VER=$(basename $(PYTHON_VERSION))
2525
# iOS, tvOS, watchOS:
2626
# https://github.com/beeware/cpython-apple-source-deps/releases
2727
BZIP2_VERSION=1.0.8-1
28-
XZ_VERSION=5.4.4-1
29-
OPENSSL_VERSION=3.0.12-1
30-
LIBFFI_VERSION=3.4.4-1
28+
MPDECIMAL_VERSION=4.0.0-1
29+
OPENSSL_VERSION=3.0.14-1
30+
LIBFFI_VERSION=3.4.6-1
31+
XZ_VERSION=5.4.7-1
3132

3233
# Supported OS
3334
OS_LIST=macOS iOS tvOS watchOS
@@ -41,12 +42,12 @@ CFLAGS-macOS=-mmacosx-version-min=$(VERSION_MIN-macOS)
4142

4243
# iOS targets
4344
TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.arm64 iphoneos.arm64
44-
VERSION_MIN-iOS=12.0
45+
VERSION_MIN-iOS=13.0
4546
CFLAGS-iOS=-mios-version-min=$(VERSION_MIN-iOS)
4647

4748
# tvOS targets
4849
TARGETS-tvOS=appletvsimulator.x86_64 appletvsimulator.arm64 appletvos.arm64
49-
VERSION_MIN-tvOS=9.0
50+
VERSION_MIN-tvOS=12.0
5051
CFLAGS-tvOS=-mtvos-version-min=$(VERSION_MIN-tvOS)
5152
PYTHON_CONFIGURE-tvOS=ac_cv_func_sigaltstack=no
5253

@@ -132,10 +133,8 @@ ARCH-$(target)=$$(subst .,,$$(suffix $(target)))
132133
ifneq ($(os),macOS)
133134
ifeq ($$(findstring simulator,$$(SDK-$(target))),)
134135
TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))$$(VERSION_MIN-$(os))
135-
TARGET_TOOL_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))
136136
else
137137
TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))$$(VERSION_MIN-$(os))-simulator
138-
TARGET_TOOL_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))-simulator
139138
endif
140139
endif
141140

@@ -288,10 +287,6 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
288287
cd $$(PYTHON_SRCDIR-$(target)) && \
289288
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/$(os)/Resources/bin:$(PATH)" \
290289
./configure \
291-
AR=$$(TARGET_TOOL_TRIPLE-$(target))-ar \
292-
CC=$$(TARGET_TOOL_TRIPLE-$(target))-clang \
293-
CPP=$$(TARGET_TOOL_TRIPLE-$(target))-cpp \
294-
CXX=$$(TARGET_TOOL_TRIPLE-$(target))-clang \
295290
LIBLZMA_CFLAGS="-I$$(XZ_INSTALL-$(target))/include" \
296291
LIBLZMA_LIBS="-L$$(XZ_INSTALL-$(target))/lib -llzma" \
297292
BZIP2_CFLAGS="-I$$(BZIP2_INSTALL-$(target))/include" \
@@ -551,7 +546,7 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
551546
tar zxf build/macOS/macosx/python-$(PYTHON_VERSION)/Python_Framework.pkgPython_Framework.pkg/PayloadPython_Framework.pkgPython_Framework.pkg/PayloadPython_Framework.pkgPython_Framework.pkg/Payload -C $$(PYTHON_FRAMEWORK-macosx) -X patch/Python/release.macOS.exclude
552547

553548
# Apply the App Store compliance patch
554-
patch --strip 2 --directory $$(PYTHON_INSTALL_VERSION-macosx)/lib/python$(PYTHON_VER) --input $(PROJECT_DIR)/patch/Python/app-store-compliance.patch
549+
# patch --strip 2 --directory $$(PYTHON_INSTALL_VERSION-macosx)/lib/python$(PYTHON_VER) --input $(PROJECT_DIR)/patch/Python/app-store-compliance.patch
555550

556551
# Rewrite the framework to make it standalone
557552
patch/make-relocatable.sh $$(PYTHON_INSTALL_VERSION-macosx) 2>&1 > /dev/null

0 commit comments

Comments
 (0)