Skip to content

Commit 3a8548f

Browse files
committed
Merge branch 'dev' into 3.7
2 parents 400fa14 + 872619e commit 3a8548f

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
@@ -490,33 +490,3 @@ vars-$1: $$(foreach target,$$(TARGETS-$1),vars-$$(target))
490490
endef
491491

492492
$(foreach os,$(OS),$(eval $(call build,$(os))))
493-
494-
###########################################################################
495-
# Compiling Python Libraries with binary components
496-
###########################################################################
497-
498-
HOST_PYTHON=$(CURDIR)/build/macOS/python/bin/python3
499-
HOST_PIP=$(CURDIR)/build/macOS/python/bin/pip3
500-
501-
# Ensure pip and setuptools are available
502-
pip: Python-macOS
503-
$(HOST_PYTHON) -m ensurepip
504-
505-
# Create the directory that will contain installed packages
506-
dist/app_packages:
507-
mkdir -p dist/app_packages
508-
509-
# Makefiles for individual binary packages that are supported.
510-
include patch/numpy/Makefile.numpy
511-
512-
define build-app-packages
513-
packages-$1: numpy-$1
514-
endef
515-
516-
$(foreach os,$(OS),$(eval $(call build-app-packages,$(os))))
517-
518-
app_packages: numpy
519-
520-
# Dump vars (for test)
521-
vars: $(foreach os,$(OS),vars-$(os))
522-
@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 @@ and armv7k for watchOS. This should enable the code to run on:
1717

1818
* MacBook (MacBooks using Apple Silicon will run under Rosetta x86 emulation)
1919
* iMac (iMacs using Apple Silicon will run under Rosetta x86 emulation)
20+
* Mac Mini (iMacs using Apple Silicon will run under Rosetta x86 emulation)
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.7
7556
.. _for iOS: https://briefcase-support.org/python?platform=iOS&version=3.7
7657
.. _for tvOS: https://briefcase-support.org/python?platform=tvOS&version=3.7

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)