Skip to content

Commit

Permalink
Correctly enforce min macOS version, and use dotted path for frameworks.
Browse files Browse the repository at this point in the history
  • Loading branch information
freakboy3742 committed Oct 20, 2023
2 parents 5364651 + dd3e00c commit ce693cc
Show file tree
Hide file tree
Showing 4 changed files with 421 additions and 557 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:
Includes:
* Python ${{ env.PY_VERSION }}.?
* OpenSSL 3.0.5
* OpenSSL 3.1.2
* BZip2 1.0.8
* XZ 5.2.6
* LibFFI 3.4.2
* XZ 5.4.4
* LibFFI 3.4.4
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}

build:
runs-on: macOS-12
runs-on: macOS-latest
needs: make-release
strategy:
max-parallel: 4
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ CURL_FLAGS=--disable --fail --location --create-dirs --progress-bar

# macOS targets
TARGETS-macOS=macosx.x86_64 macosx.arm64
VERSION_MIN-macOS=10.15
VERSION_MIN-macOS=11.0
CFLAGS-macOS=-mmacosx-version-min=$(VERSION_MIN-macOS)

# iOS targets
Expand Down Expand Up @@ -842,6 +842,7 @@ $$(PYTHON_SRCDIR-$(sdk))/Makefile: \
CPP=$$(TARGET_TRIPLE-$(sdk))-cpp \
CFLAGS="$$(CFLAGS-$(sdk)) -I$$(BZIP2_MERGE-$(sdk))/include -I$$(XZ_MERGE-$(sdk))/include" \
LDFLAGS="$$(LDFLAGS-$(sdk)) -L$$(XZ_MERGE-$(sdk))/lib -L$$(BZIP2_MERGE-$(sdk))/lib" \
MACOSX_DEPLOYMENT_TARGET="$$(VERSION_MIN-$(os))" \
--prefix="$$(PYTHON_INSTALL-$(sdk))" \
--enable-ipv6 \
--enable-universalsdk \
Expand Down
5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ repository:
* `Python 3.10 <https://github.com/beeware/Python-Apple-support/tree/3.10>`__
* `Python 3.11 <https://github.com/beeware/Python-Apple-support/tree/3.11>`__
* `Python 3.12 <https://github.com/beeware/Python-Apple-support/tree/3.12>`__
* `Python 3.13 <https://github.com/beeware/Python-Apple-support/tree/3.13>`__

It works by downloading, patching, and building a fat binary of Python and selected
pre-requisites, and packaging them as static libraries that can be incorporated into an
Expand Down Expand Up @@ -41,10 +42,10 @@ The binaries support x86_64 and arm64 for macOS; arm64 for iOS and appleTV
devices; and arm64_32 for watchOS. It also supports device simulators on both
x86_64 and M1 hardware. This should enable the code to run on:

* macOS 10.15 (Catalina) or later, on:
* macOS 11 (Big Sur) or later, on:
* MacBook (including MacBooks using Apple Silicon)
* iMac (including iMacs using Apple Silicon)
* Mac Mini (including M1 Apple Silicon Mac minis)
* Mac Mini (including Apple Silicon Mac minis)
* Mac Studio (all models)
* Mac Pro (all models)
* iOS 12.0 or later, on:
Expand Down
Loading

0 comments on commit ce693cc

Please sign in to comment.