Corrected problem with allowing subprocesses on non-iOS.

beeware · Sep 5, 2016 · e8f86f6 · e8f86f6
1 parent 384b883
commit e8f86f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@
 # Current director
 PROJECT_DIR=$(shell pwd)
 
-BUILD_NUMBER=1
+BUILD_NUMBER=2
 
 # Version of packages that will be compiled by this meta-package
 PYTHON_VERSION=3.5.2
@@ -265,7 +265,7 @@ else
 	cp -f $(PROJECT_DIR)/patch/Python/Setup.embedded $$(PYTHON_DIR-$1)/Modules/Setup.embedded
 	cd $$(PYTHON_DIR-$1) && PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/python/bin:$(PATH) ./configure \
 		CC="$$(CC-$1)" LD="$$(CC-$1)" \
-		--host=$$(MACHINE_DETAILED-$1)-apple-ios --build=x86_64-apple-darwin$(shell uname -r) \
+		--host=$$(MACHINE_DETAILED-$1)-apple-$2 --build=x86_64-apple-darwin$(shell uname -r) \
 		--prefix=$(PROJECT_DIR)/$$(PYTHON_DIR-$1)/dist \
 		--without-pymalloc --without-doc-strings --disable-ipv6 --without-ensurepip \
 		ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no \

diff --git a/README.rst b/README.rst
@@ -12,7 +12,7 @@ It works by downloading, patching, and building a fat binary of Python and
 selected pre-requisites, and packaging them both in Apple Framework format.
 
 The binaries support the ``$(ARCHS_STANDARD)`` set - that is, x86_64 for
-macOS,  armv7 and arm64 for iOS devices, arm64 for appleTV devices, and armv7k
+macOS, armv7 and arm64 for iOS devices, arm64 for appleTV devices, and armv7k
 for watchOS. This should enable the code to run on:
 
 * MacBook (including Pro & Air)
@@ -72,10 +72,10 @@ This should:
 The build products will be in the `build` directory; the compiled frameworks
 will be in the `dist` directory.
 
-.. _for macOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-macOS-support.b1.tar.gz
-.. _for iOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-iOS-support.b1.tar.gz
-.. _for tvOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-tvOS-support.b1.tar.gz
-.. _for watchOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b1/Python-3.5-watchOS-support.b1.tar.gz
+.. _for macOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-macOS-support.b2.tar.gz
+.. _for iOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-iOS-support.b2.tar.gz
+.. _for tvOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-tvOS-support.b2.tar.gz
+.. _for watchOS: https://github.com/pybee/Python-Apple-support/releases/download/3.5-b2/Python-3.5-watchOS-support.b2.tar.gz
 
 Acknowledgements
 ----------------

diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
@@ -860,7 +860,7 @@ diff -Nru orig/Lib/importlib/_bootstrap_external.py modified/Lib/importlib/_boot
  def _make_relax_case():
 diff -Nru orig/Lib/os.py modified/Lib/os.py
 --- orig/Lib/os.py	2016-06-26 05:38:36.000000000 +0800
-+++ modified/Lib/os.py	2016-07-06 16:40:19.000000000 +0800
++++ modified/Lib/os.py	2016-09-05 16:21:09.000000000 +0800
 @@ -32,7 +32,7 @@
  __all__ = ["altsep", "curdir", "pardir", "sep", "pathsep", "linesep",
             "defpath", "name", "path", "devnull", "SEEK_SET", "SEEK_CUR",
@@ -886,7 +886,7 @@ diff -Nru orig/Lib/os.py modified/Lib/os.py
 +if sys.platform in ('iOS', 'tvos', 'watchos'):
 +    allows_subprocesses = False
 +else:
-+    allows_subprocesses = False
++    allows_subprocesses = True
 +
 +
  # Supply spawn*() (probably only for Unix)