Skip to content

Commit 4413089

Browse files
committed
Merge branch 'dev' into 3.9
2 parents 7aafadf + 872619e commit 4413089

File tree

5 files changed

+1
-411
lines changed

5 files changed

+1
-411
lines changed

Makefile

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -558,33 +558,3 @@ vars-$1: $$(foreach target,$$(TARGETS-$1),vars-$$(target))
558558
endef
559559

560560
$(foreach os,$(OS),$(eval $(call build,$(os))))
561-
562-
###########################################################################
563-
# Compiling Python Libraries with binary components
564-
###########################################################################
565-
566-
HOST_PYTHON=$(CURDIR)/build/macOS/python/bin/python3
567-
HOST_PIP=$(CURDIR)/build/macOS/python/bin/pip3
568-
569-
# Ensure pip and setuptools are available
570-
pip: Python-macOS
571-
$(HOST_PYTHON) -m ensurepip
572-
573-
# Create the directory that will contain installed packages
574-
dist/app_packages:
575-
mkdir -p dist/app_packages
576-
577-
# Makefiles for individual binary packages that are supported.
578-
include patch/numpy/Makefile.numpy
579-
580-
define build-app-packages
581-
packages-$1: numpy-$1
582-
endef
583-
584-
$(foreach os,$(OS),$(eval $(call build-app-packages,$(os))))
585-
586-
app_packages: numpy
587-
588-
# Dump vars (for test)
589-
vars: $(foreach os,$(OS),vars-$(os))
590-
@echo "APP_PACKAGES: $(APP_PACKAGES)"

README.rst

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ devices; and armv7k for watchOS. This should enable the code to run on:
1717

1818
* MacBook (including MacBooks using Apple Silicon)
1919
* iMac (including iMacs using Apple Silicon)
20+
* Mac Mini (including M1 Apple Silicon Mac minis)
2021
* Mac Pro
2122
* iPhone (5s or later)
2223
* iPad (5th gen or later)
@@ -51,26 +52,6 @@ This should:
5152
The build products will be in the `build` directory; the compiled frameworks
5253
will be in the `dist` directory.
5354

54-
Binary packages
55-
---------------
56-
57-
These tools are also able to compile the following packages that have binary
58-
components:
59-
60-
* `numpy <patch/numpy/README.rst>`__
61-
62-
These binary components are not compiled by default. However, the build
63-
infrastructure of this project can compile them on request. You can run::
64-
65-
make <name of package>
66-
67-
to build a specific package; or, to build all supported packages::
68-
69-
make app_packages
70-
71-
For details on how to add these binary packages to your project, see the
72-
package-specific documentation linked above.
73-
7455
.. _for macOS: https://briefcase-support.org/python?platform=macOS&version=3.9
7556
.. _for iOS: https://briefcase-support.org/python?platform=iOS&version=3.9
7657
.. _for tvOS: https://briefcase-support.org/python?platform=tvOS&version=3.9

patch/numpy/Makefile.numpy

Lines changed: 0 additions & 78 deletions
This file was deleted.

patch/numpy/README.rst

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)