Skip to content

Commit b4678bc

Browse files
authored
Update patch for 3.14.6. (#353)
1 parent 10c73d7 commit b4678bc

2 files changed

Lines changed: 4938 additions & 1338 deletions

File tree

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ BUILD_NUMBER=custom
1919
# of a release cycle, as official binaries won't be published.
2020
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
2121
# PYTHON_VER is the major/minor version (e.g., 3.10)
22-
PYTHON_VERSION=3.14.2
22+
PYTHON_VERSION=3.14.6
2323
PYTHON_PKG_VERSION=$(PYTHON_VERSION)
2424
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
2525
PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -30,7 +30,7 @@ PYTHON_VER=$(basename $(PYTHON_VERSION))
3030
BZIP2_VERSION=1.0.8-2
3131
LIBFFI_VERSION=3.4.7-2
3232
MPDECIMAL_VERSION=4.0.0-2
33-
OPENSSL_VERSION=3.0.18-1
33+
OPENSSL_VERSION=3.5.7-1
3434
XZ_VERSION=5.6.4-2
3535
ZSTD_VERSION=1.5.7-1
3636

@@ -314,15 +314,15 @@ $$(PYTHON_SRCDIR-$(target))/configure: \
314314
# Apply target Python patches
315315
cd $$(PYTHON_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/Python/Python.patch
316316
# Make sure the binary scripts are executable
317-
chmod 755 $$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin/*
317+
chmod 755 $$(PYTHON_SRCDIR-$(target))/Platforms/Apple/$(os)/Resources/bin/*
318318
# Touch the configure script to ensure that Make identifies it as up to date.
319319
touch $$(PYTHON_SRCDIR-$(target))/configure
320320

321321
$$(PYTHON_SRCDIR-$(target))/Makefile: \
322322
$$(PYTHON_SRCDIR-$(target))/configure
323323
# Configure target Python
324324
cd $$(PYTHON_SRCDIR-$(target)) && \
325-
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
325+
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Platforms/Apple/$(os)/Resources/bin:$(PATH)" \
326326
./configure \
327327
LIBLZMA_CFLAGS="-I$$(XZ_INSTALL-$(target))/include" \
328328
LIBLZMA_LIBS="-L$$(XZ_INSTALL-$(target))/lib -llzma" \
@@ -346,14 +346,14 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
346346
$$(PYTHON_SRCDIR-$(target))/python.exe: $$(PYTHON_SRCDIR-$(target))/Makefile
347347
@echo ">>> Build Python for $(target)"
348348
cd $$(PYTHON_SRCDIR-$(target)) && \
349-
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
349+
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Platforms/Apple/$(os)/Resources/bin:$(PATH)" \
350350
make -j8 all \
351351
2>&1 | tee -a ../python-$(PYTHON_VERSION).build.log
352352

353353
$$(PYTHON_LIB-$(target)): $$(PYTHON_SRCDIR-$(target))/python.exe
354354
@echo ">>> Install Python for $(target)"
355355
cd $$(PYTHON_SRCDIR-$(target)) && \
356-
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Apple/$(os)/Resources/bin:$(PATH)" \
356+
PATH="$(PROJECT_DIR)/$$(PYTHON_SRCDIR-$(target))/Platforms/Apple/$(os)/Resources/bin:$(PATH)" \
357357
make install \
358358
2>&1 | tee -a ../python-$(PYTHON_VERSION).install.log
359359

@@ -521,7 +521,7 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk))
521521
$$(foreach target,$$(SDK_TARGETS-$(sdk)),cp $$(PYTHON_INCLUDE-$$(target))/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig-$$(ARCH-$$(target)).h; )
522522

523523
# Copy the cross-target header from the source folder of the first target in the $(sdk) SDK
524-
cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Apple/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
524+
cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Platforms/Apple/$(os)/Resources/pyconfig.h $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h
525525

526526

527527
$$(PYTHON_PLATFORM_CONFIG-$(sdk))/sitecustomize.py: $$(PYTHON_LIB-$(sdk)) $$(PYTHON_FRAMEWORK-$(sdk))/Info.plist $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h $$(foreach target,$$(SDK_TARGETS-$(sdk)),$$(PYTHON_PLATFORM_SITECUSTOMIZE-$$(target)))
@@ -678,8 +678,8 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
678678

679679
@echo ">>> Install build tools for $(os)"
680680
mkdir $$(PYTHON_XCFRAMEWORK-$(os))/build
681-
cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed/Python.xcframework/build/utils.sh $$(PYTHON_XCFRAMEWORK-$(os))/build
682-
cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed/Python.xcframework/build/$$(PLATFORM_NAME-$(os))-dylib-Info-template.plist $$(PYTHON_XCFRAMEWORK-$(os))/build
681+
cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Platforms/Apple/testbed/Python.xcframework/build/utils.sh $$(PYTHON_XCFRAMEWORK-$(os))/build
682+
cp $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Platforms/Apple/testbed/Python.xcframework/build/$$(PLATFORM_NAME-$(os))-dylib-Info-template.plist $$(PYTHON_XCFRAMEWORK-$(os))/build
683683

684684
@echo ">>> Install stdlib for $(os)"
685685
mkdir -p $$(PYTHON_XCFRAMEWORK-$(os))/lib
@@ -707,7 +707,7 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
707707

708708
ifeq ($(filter $(os),iOS tvOS visionOS),$(os))
709709
@echo ">>> Clone testbed project for $(os)"
710-
$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Apple/testbed clone --platform $(os) --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
710+
$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/Platforms/Apple/testbed clone --platform $(os) --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
711711
endif
712712

713713
@echo ">>> Create VERSIONS file for $(os)"

0 commit comments

Comments
 (0)