Skip to content

Commit 7616814

Browse files
committed
Merge branch 'main' into 3.10
2 parents 9506142 + a1f3b83 commit 7616814

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ LIBFFI_VERSION=3.4.4
6161
DEPENDENCIES=BZip2 XZ OpenSSL libFFI
6262
OS_LIST=macOS iOS tvOS watchOS
6363

64-
CURL_FLAGS=--fail --location --create-dirs --progress-bar
64+
CURL_FLAGS=--disable --fail --location --create-dirs --progress-bar
6565

6666
# macOS targets
6767
TARGETS-macOS=macosx.x86_64 macosx.arm64
@@ -415,7 +415,7 @@ $$(OPENSSL_SRCDIR-$(target))/libssl.a: $$(OPENSSL_SRCDIR-$(target))/is_configure
415415
CC="$$(CC-$(target)) $$(CFLAGS-$(target))" \
416416
CROSS_TOP="$$(dir $$(SDK_ROOT-$(target))).." \
417417
CROSS_SDK="$$(notdir $$(SDK_ROOT-$(target)))" \
418-
make all \
418+
make build_sw \
419419
2>&1 | tee -a ../openssl-$(OPENSSL_VERSION).build.log
420420

421421
$$(OPENSSL_SSL_LIB-$(target)): $$(OPENSSL_SRCDIR-$(target))/libssl.a

README.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ repository:
1010

1111
* `Python 3.8 <https://github.com/beeware/Python-Apple-support/tree/3.8>`__
1212
* `Python 3.9 <https://github.com/beeware/Python-Apple-support/tree/3.9>`__
13-
* `Python 3.10 <https://github.com/beeware/Python-Apple-support/tree/3.10>`__
1413
* `Python 3.11 <https://github.com/beeware/Python-Apple-support/tree/3.11>`__
1514

1615
It works by downloading, patching, and building a fat binary of Python and
@@ -64,8 +63,8 @@ The easist way to use these packages is by creating a project with `Briefcase
6463
versions of these support packages, and add them to an XCode project (or
6564
pre-build stub application, in the case of macOS).
6665

67-
Pre-built versions of the frameworks can be downloaded `for macOS`_, `for
68-
iOS`_, `for tvOS`_, and `for watchOS`_, and added to your project.
66+
Pre-built versions of the frameworks can be downloaded from the `Github releases page
67+
<https://github.com/beeware/Python-Apple-support/releases>`__ and added to your project.
6968

7069
Alternatively, to build the frameworks on your own, download/clone this
7170
repository, and then in the root directory, and run:
@@ -125,11 +124,6 @@ To build these wheels, run:
125124
* `make wheels-tvOS` to build all the tvOS wheels
126125
* `make wheels-watchOS` to build all the watchOS wheels
127126

128-
.. _for macOS: https://briefcase-support.s3.amazonaws.com/python/3.10/macOS/Python-3.10-macOS-support.b4.tar.gz
129-
.. _for iOS: https://briefcase-support.s3.amazonaws.com/python/3.10/iOS/Python-3.10-iOS-support.b4.tar.gz
130-
.. _for tvOS: https://briefcase-support.s3.amazonaws.com/python/3.10/tvOS/Python-3.10-tvOS-support.b4.tar.gz
131-
.. _for watchOS: https://briefcase-support.s3.amazonaws.com/python/3.10/watchOS/Python-3.10-watchOS-support.b4.tar.gz
132-
133127
Historical support
134128
------------------
135129

0 commit comments

Comments
 (0)