Skip to content

Commit e8f86f6

Browse files
committed
Corrected problem with allowing subprocesses on non-iOS.
1 parent 384b883 commit e8f86f6

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Current director
2626
PROJECT_DIR=$(shell pwd)
2727

28-
BUILD_NUMBER=1
28+
BUILD_NUMBER=2
2929

3030
# Version of packages that will be compiled by this meta-package
3131
PYTHON_VERSION=3.5.2
@@ -265,7 +265,7 @@ else
265265
cp -f $(PROJECT_DIR)/patch/Python/Setup.embedded $$(PYTHON_DIR-$1)/Modules/Setup.embedded
266266
cd $$(PYTHON_DIR-$1) && PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/python/bin:$(PATH) ./configure \
267267
CC="$$(CC-$1)" LD="$$(CC-$1)" \
268-
--host=$$(MACHINE_DETAILED-$1)-apple-ios --build=x86_64-apple-darwin$(shell uname -r) \
268+
--host=$$(MACHINE_DETAILED-$1)-apple-$2 --build=x86_64-apple-darwin$(shell uname -r) \
269269
--prefix=$(PROJECT_DIR)/$$(PYTHON_DIR-$1)/dist \
270270
--without-pymalloc --without-doc-strings --disable-ipv6 --without-ensurepip \
271271
ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no \

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It works by downloading, patching, and building a fat binary of Python and
1212
selected pre-requisites, and packaging them both in Apple Framework format.
1313

1414
The binaries support the ``$(ARCHS_STANDARD)`` set - that is, x86_64 for
15-
macOS, armv7 and arm64 for iOS devices, arm64 for appleTV devices, and armv7k
15+
macOS, armv7 and arm64 for iOS devices, arm64 for appleTV devices, and armv7k
1616
for watchOS. This should enable the code to run on:
1717

1818
* MacBook (including Pro & Air)
@@ -72,10 +72,10 @@ This should:
7272
The build products will be in the `build` directory; the compiled frameworks
7373
will be in the `dist` directory.
7474

75-
.. _for macOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-macOS-support.b1.tar.gz
76-
.. _for iOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-iOS-support.b1.tar.gz
77-
.. _for tvOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-tvOS-support.b1.tar.gz
78-
.. _for watchOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-watchOS-support.b1.tar.gz
75+
.. _for macOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-macOS-support.b2.tar.gz
76+
.. _for iOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-iOS-support.b2.tar.gz
77+
.. _for tvOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-tvOS-support.b2.tar.gz
78+
.. _for watchOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-watchOS-support.b2.tar.gz
7979

8080
Acknowledgements
8181
----------------

patch/Python/Python.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ diff -Nru orig/Lib/importlib/_bootstrap_external.py modified/Lib/importlib/_boot
860860
def _make_relax_case():
861861
diff -Nru orig/Lib/os.py modified/Lib/os.py
862862
--- orig/Lib/os.py 2016-06-26 05:38:36.000000000 +0800
863-
+++ modified/Lib/os.py 2016-07-06 16:40:19.000000000 +0800
863+
+++ modified/Lib/os.py 2016-09-05 16:21:09.000000000 +0800
864864
@@ -32,7 +32,7 @@
865865
__all__ = ["altsep", "curdir", "pardir", "sep", "pathsep", "linesep",
866866
"defpath", "name", "path", "devnull", "SEEK_SET", "SEEK_CUR",
@@ -886,7 +886,7 @@ diff -Nru orig/Lib/os.py modified/Lib/os.py
886886
+if sys.platform in ('iOS', 'tvos', 'watchos'):
887887
+ allows_subprocesses = False
888888
+else:
889-
+ allows_subprocesses = False
889+
+ allows_subprocesses = True
890890
+
891891
+
892892
# Supply spawn*() (probably only for Unix)

0 commit comments

Comments
 (0)