From 6be4cfff14252db2aa8b3d5f8a44107293555f24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:26:56 +0000 Subject: [PATCH 1/6] Bump actions/upload-artifact from 4.3.5 to 4.3.6 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.3.5...v4.3.6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 416507a..a60f28a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -121,7 +121,7 @@ jobs: make ${{ matrix.target }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }} - name: Upload build artefacts - uses: actions/upload-artifact@v4.3.5 + uses: actions/upload-artifact@v4.3.6 with: name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz From 070ee964cacb5818d33f5393a75f8e7d7208f30f Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 16 Aug 2024 11:46:08 +0800 Subject: [PATCH 2/6] Revert TODOs related to in-progress briefcase work. --- .github/workflows/ci.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a60f28a..b048fb2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -131,20 +131,15 @@ jobs: with: repository: beeware/Python-support-testbed path: Python-support-testbed - # TODO - remove the py3.13 reference option. - ref: py3.13-support - name: Install dependencies if: matrix.run-tests run: | - # TODO - Revert to the development version of Briefcase # Use the development version of Briefcase - # python -m pip install git+https://github.com/beeware/briefcase.git - python -m pip install git+https://github.com/freakboy3742/briefcase.git@version-bumps + python -m pip install git+https://github.com/beeware/briefcase.git - name: Run support testbed check if: matrix.run-tests timeout-minutes: 10 working-directory: Python-support-testbed - # TODO - remove the template_branch option. - run: briefcase run ${{ matrix.target }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\' -C template_branch=\'framework-lib\' + run: briefcase run ${{ matrix.target }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\' From 132f9dc9c4c6c927e4597623c7dfdee8046311b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:41:03 +0000 Subject: [PATCH 3/6] Bump actions/setup-python from 5.1.1 to 5.2.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- .github/workflows/publish.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a60f28a..8d19618 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -109,7 +109,7 @@ jobs: - uses: actions/checkout@v4.1.7 - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: # Appending -dev ensures that we can always build the dev release. # It's a no-op for versions that have been published. diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e1b09da..e90bf31 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python environment - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: "3.X" From 3b95db42590a7a4c367049b83cde87a8827faebd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:41:06 +0000 Subject: [PATCH 4/6] Bump actions/upload-artifact from 4.3.6 to 4.4.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.3.6...v4.4.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a60f28a..c23c01d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -121,7 +121,7 @@ jobs: make ${{ matrix.target }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }} - name: Upload build artefacts - uses: actions/upload-artifact@v4.3.6 + uses: actions/upload-artifact@v4.4.0 with: name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz From a0f789d7e66d1d6ae0a5ba1058d8bced18dbc33d Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 9 Sep 2024 08:44:53 +0800 Subject: [PATCH 5/6] Update patch for v3.13.0rc2. Also updates: - XZ 5.6.2 - OpenSSL 3.0.15 --- Makefile | 6 +-- README.rst | 2 +- patch/Python/Python.patch | 92 ++++++++++++++++++++++++++------------- 3 files changed, 65 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 3ed4fea..b98908e 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ BUILD_NUMBER=custom # of a release cycle, as official binaries won't be published. # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0) # PYTHON_VER is the major/minor version (e.g., 3.10) -PYTHON_VERSION=3.13.0rc1 +PYTHON_VERSION=3.13.0rc2 PYTHON_PKG_VERSION=$(PYTHON_VERSION) PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+") PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+") @@ -29,8 +29,8 @@ PYTHON_VER=$(basename $(PYTHON_VERSION)) BZIP2_VERSION=1.0.8-1 LIBFFI_VERSION=3.4.6-1 MPDECIMAL_VERSION=4.0.0-1 -OPENSSL_VERSION=3.0.14-1 -XZ_VERSION=5.4.7-1 +OPENSSL_VERSION=3.0.15-1 +XZ_VERSION=5.6.2-1 # Supported OS OS_LIST=macOS iOS tvOS watchOS diff --git a/README.rst b/README.rst index b1b3147..cd395fc 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ Python Apple Support This is a meta-package for building a version of Python that can be embedded into a macOS, iOS, tvOS or watchOS project. -**This branch builds a packaged version of Python 3.13.0**. +**This branch builds a packaged version of Python 3.13.0rc2**. Other Python versions are available by cloning other branches of the main repository: diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch index 3317a84..7ec76ce 100644 --- a/patch/Python/Python.patch +++ b/patch/Python/Python.patch @@ -163,7 +163,7 @@ index ec0857a4a99..2350e9dc821 100644 # elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX PLATFORM_TRIPLET=darwin diff --git a/configure b/configure -index beffc1fd76c..b2daf3467cd 100755 +index 7e1e5e594ca..39a050c1451 100755 --- a/configure +++ b/configure @@ -978,6 +978,8 @@ @@ -243,17 +243,17 @@ index beffc1fd76c..b2daf3467cd 100755 esac fi @@ -4147,6 +4179,14 @@ - aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;; - aarch64-apple-ios*) CXX=arm64-apple-ios-clang ;; - x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang ;; + aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;; + aarch64-apple-ios*) CXX=arm64-apple-ios-clang++ ;; + x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang++ ;; + -+ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang ;; -+ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang ;; -+ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang ;; ++ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;; ++ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang++ ;; ++ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang++ ;; + -+ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang ;; -+ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang ;; -+ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang ;; ++ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;; ++ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang++ ;; ++ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang++ ;; *) esac fi @@ -709,8 +709,8 @@ index beffc1fd76c..b2daf3467cd 100755 then for ac_func in clock_settime -@@ -24590,8 +24746,8 @@ - MODULE_LDFLAGS="\$(BLDLIBRARY)" +@@ -24593,8 +24749,8 @@ + LIBPYTHON="\$(BLDLIBRARY)" fi -# On iOS the shared libraries must be linked with the Python framework @@ -720,7 +720,7 @@ index beffc1fd76c..b2daf3467cd 100755 MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)" fi -@@ -27239,7 +27395,7 @@ +@@ -27242,7 +27398,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 printf "%s\n" "$as_me: checking for device files" >&6;} @@ -729,7 +729,7 @@ index beffc1fd76c..b2daf3467cd 100755 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no else -@@ -27672,7 +27828,7 @@ +@@ -27675,7 +27831,7 @@ with_ensurepip=no ;; #( WASI) : with_ensurepip=no ;; #( @@ -738,7 +738,7 @@ index beffc1fd76c..b2daf3467cd 100755 with_ensurepip=no ;; #( *) : with_ensurepip=upgrade -@@ -28699,7 +28855,7 @@ +@@ -28700,7 +28856,7 @@ ;; #( Darwin) : ;; #( @@ -747,7 +747,7 @@ index beffc1fd76c..b2daf3467cd 100755 -@@ -32464,6 +32620,8 @@ +@@ -32465,6 +32621,8 @@ "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;; "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;; "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;; @@ -757,7 +757,7 @@ index beffc1fd76c..b2daf3467cd 100755 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;; "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;; diff --git a/configure.ac b/configure.ac -index 5842bd24c45..f97279331f6 100644 +index 58f54076ff2..4825d131142 100644 --- a/configure.ac +++ b/configure.ac @@ -330,6 +330,12 @@ @@ -828,17 +828,17 @@ index 5842bd24c45..f97279331f6 100644 esac fi @@ -421,6 +451,14 @@ - aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;; - aarch64-apple-ios*) CXX=arm64-apple-ios-clang ;; - x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang ;; + aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;; + aarch64-apple-ios*) CXX=arm64-apple-ios-clang++ ;; + x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang++ ;; + -+ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang ;; -+ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang ;; -+ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang ;; ++ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;; ++ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang++ ;; ++ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang++ ;; + -+ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang ;; -+ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang ;; -+ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang ;; ++ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;; ++ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang++ ;; ++ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang++ ;; *) esac fi @@ -1211,8 +1211,8 @@ index 5842bd24c45..f97279331f6 100644 then AC_CHECK_FUNCS([clock_settime], [], [ AC_CHECK_LIB([rt], [clock_settime], [ -@@ -6176,8 +6316,8 @@ - MODULE_LDFLAGS="\$(BLDLIBRARY)" +@@ -6179,8 +6319,8 @@ + LIBPYTHON="\$(BLDLIBRARY)" fi -# On iOS the shared libraries must be linked with the Python framework @@ -1222,7 +1222,7 @@ index 5842bd24c45..f97279331f6 100644 MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)" fi -@@ -6785,7 +6925,7 @@ +@@ -6788,7 +6928,7 @@ dnl NOTE: Inform user how to proceed with files when cross compiling. dnl Some cross-compile builds are predictable; they won't ever dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly. @@ -1231,7 +1231,7 @@ index 5842bd24c45..f97279331f6 100644 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no else -@@ -7042,7 +7182,7 @@ +@@ -7045,7 +7185,7 @@ AS_CASE([$ac_sys_system], [Emscripten], [with_ensurepip=no], [WASI], [with_ensurepip=no], @@ -1240,7 +1240,7 @@ index 5842bd24c45..f97279331f6 100644 [with_ensurepip=upgrade] ) ]) -@@ -7452,7 +7592,7 @@ +@@ -7454,7 +7594,7 @@ [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])], dnl The _scproxy module is available on macOS [Darwin], [], @@ -1428,6 +1428,11 @@ index c3e261ecd9e..26ef7a95de4 100644 +#!/bin/bash +xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos $@ --- /dev/null ++++ b/tvOS/Resources/bin/arm64-apple-tvos-clang++ +@@ -0,0 +1,2 @@ ++#!/bin/bash ++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos $@ +--- /dev/null +++ b/tvOS/Resources/bin/arm64-apple-tvos-cpp @@ -0,0 +1,2 @@ +#!/bin/bash @@ -1443,6 +1448,11 @@ index c3e261ecd9e..26ef7a95de4 100644 +#!/bin/bash +xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator $@ --- /dev/null ++++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++ +@@ -0,0 +1,2 @@ ++#!/bin/bash ++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos-simulator $@ +--- /dev/null +++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp @@ -0,0 +1,2 @@ +#!/bin/bash @@ -1458,6 +1468,11 @@ index c3e261ecd9e..26ef7a95de4 100644 +#!/bin/bash +xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator $@ --- /dev/null ++++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++ +@@ -0,0 +1,2 @@ ++#!/bin/bash ++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos-simulator $@ +--- /dev/null +++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp @@ -0,0 +1,2 @@ +#!/bin/bash @@ -1660,6 +1675,11 @@ index c3e261ecd9e..26ef7a95de4 100644 +#!/bin/bash +xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos-simulator $@ --- /dev/null ++++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++ +@@ -0,0 +1,2 @@ ++#!/bin/bash ++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos-simulator $@ +--- /dev/null +++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp @@ -0,0 +1,2 @@ +#!/bin/bash @@ -1675,6 +1695,11 @@ index c3e261ecd9e..26ef7a95de4 100644 +#!/bin/bash +xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos $@ --- /dev/null ++++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang++ +@@ -0,0 +1,2 @@ ++#!/bin/bash ++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos $@ +--- /dev/null +++ b/watchOS/Resources/bin/arm64_32-apple-watchos-cpp @@ -0,0 +1,2 @@ +#!/bin/bash @@ -1690,6 +1715,11 @@ index c3e261ecd9e..26ef7a95de4 100644 +#!/bin/bash +xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator $@ --- /dev/null ++++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++ +@@ -0,0 +1,2 @@ ++#!/bin/bash ++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos-simulator $@ +--- /dev/null +++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp @@ -0,0 +1,2 @@ +#!/bin/bash From e742508fc6d1aed96c692e15b881bdc794ffc786 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 9 Sep 2024 10:49:21 +0800 Subject: [PATCH 6/6] Ensure dylibs and macOS packaging confirmation files aren't included in builds. --- Makefile | 10 +++++----- patch/Python/release.macOS.exclude | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b98908e..f7f1bc2 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz: $$(BZIP2_LIB-$(target)): downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz @echo ">>> Install BZip2 for $(target)" mkdir -p $$(BZIP2_INSTALL-$(target)) - cd $$(BZIP2_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz + cd $$(BZIP2_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz --exclude="*.dylib" # Ensure the target is marked as clean. touch $$(BZIP2_LIB-$(target)) @@ -172,7 +172,7 @@ downloads/xz-$(XZ_VERSION)-$(target).tar.gz: $$(XZ_LIB-$(target)): downloads/xz-$(XZ_VERSION)-$(target).tar.gz @echo ">>> Install XZ for $(target)" mkdir -p $$(XZ_INSTALL-$(target)) - cd $$(XZ_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/xz-$(XZ_VERSION)-$(target).tar.gz + cd $$(XZ_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/xz-$(XZ_VERSION)-$(target).tar.gz --exclude="*.dylib" # Ensure the target is marked as clean. touch $$(XZ_LIB-$(target)) @@ -192,7 +192,7 @@ downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz: $$(MPDECIMAL_LIB-$(target)): downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz @echo ">>> Install mpdecimal for $(target)" mkdir -p $$(MPDECIMAL_INSTALL-$(target)) - cd $$(MPDECIMAL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz + cd $$(MPDECIMAL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz --exclude="*.dylib" # Ensure the target is marked as clean. touch $$(MPDECIMAL_LIB-$(target)) @@ -212,7 +212,7 @@ downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz: $$(OPENSSL_SSL_LIB-$(target)): downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz @echo ">>> Install OpenSSL for $(target)" mkdir -p $$(OPENSSL_INSTALL-$(target)) - cd $$(OPENSSL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz + cd $$(OPENSSL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz --exclude="*.dylib" # Ensure the target is marked as clean. touch $$(OPENSSL_SSL_LIB-$(target)) @@ -237,7 +237,7 @@ downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz: $$(LIBFFI_LIB-$(target)): downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz @echo ">>> Install libFFI for $(target)" mkdir -p $$(LIBFFI_INSTALL-$(target)) - cd $$(LIBFFI_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz + cd $$(LIBFFI_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz --exclude="*.dylib" # Ensure the target is marked as clean. touch $$(LIBFFI_LIB-$(target)) diff --git a/patch/Python/release.macOS.exclude b/patch/Python/release.macOS.exclude index f45bf7f..3bc247c 100644 --- a/patch/Python/release.macOS.exclude +++ b/patch/Python/release.macOS.exclude @@ -2,7 +2,21 @@ # when building macOS Python-Apple-support tarballs from the official Framework # It is used by `tar -X` during the Makefile build. # +._Headers +._Python +._Resources +Resources/._Python.app Resources/Python.app +Versions/._Current +Versions/*/.__CodeSignature +Versions/*/._bin +Versions/*/._etc +Versions/*/._Frameworks +Versions/*/._Headers +Versions/*/._include +Versions/*/._lib +Versions/*/._Resources +Versions/*/._share Versions/*/bin Versions/*/etc Versions/*/Frameworks