Tweaks to commit 3859bc2.

Author: freakboy3742

Makefile

@@ -1,56 +1,56 @@
 #
 # Useful targets:
-# - all-iOS			- build everything for iOS
-# - all-tvOS			- build everything for tvOS
-# - all-watchOS			- build everything for watchOS
-# - OpenSSL.framework-iOS	- build OpenSSL.framework for iOS
-# - OpenSSL.framework-tvOS	- build OpenSSL.framework for tvOS
-# - OpenSSL.framework-watchOS	- build OpenSSL.framework for watchOS
-# - Python.framework-iOS	- build Python.framework for iOS
-# - Python.framework-tvOS	- build Python.framework for tvOS
-# - Python.framework-watchOS	- build Python.framework for watchOS
-# - Python-host			- build host python
+# - all                         - build everything
+# - iOS                         - build everything for iOS
+# - tvOS                        - build everything for tvOS
+# - watchOS                     - build everything for watchOS
+# - OpenSSL.framework-iOS       - build OpenSSL.framework for iOS
+# - OpenSSL.framework-tvOS      - build OpenSSL.framework for tvOS
+# - OpenSSL.framework-watchOS   - build OpenSSL.framework for watchOS
+# - Python.framework-iOS        - build Python.framework for iOS
+# - Python.framework-tvOS       - build Python.framework for tvOS
+# - Python.framework-watchOS    - build Python.framework for watchOS
+# - Python-host                 - build host python
 
 # Current director
 PROJECT_DIR=$(shell pwd)
 
-BUILD_NUMBER=3
+BUILD_NUMBER=4
 
 # Version of packages that will be compiled by this meta-package
-PYTHON_VERSION=	3.4.2
+PYTHON_VERSION=3.4.2
 PYTHON_VER=	$(basename $(PYTHON_VERSION))
 
 OPENSSL_VERSION_NUMBER=1.0.2
-OPENSSL_REVISION=d
+OPENSSL_REVISION=e
 OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
 
 # Supported OS
 OS=	iOS tvOS watchOS
 
 # iOS targets
-TARGETS-iOS=		iphonesimulator.x86_64 iphonesimulator.i386\
-			iphoneos.armv7 iphoneos.armv7s iphoneos.arm64
-CFLAGS-iOS=		-miphoneos-version-min=7.0
+TARGETS-iOS=iphonesimulator.x86_64 iphonesimulator.i386 iphoneos.armv7 iphoneos.armv7s iphoneos.arm64
+CFLAGS-iOS=-miphoneos-version-min=7.0
 CFLAGS-iphoneos.armv7=	-fembed-bitcode
 CFLAGS-iphoneos.armv7s=	-fembed-bitcode
 CFLAGS-iphoneos.arm64=	-fembed-bitcode
 
 # tvOS targets
-TARGETS-tvOS=		appletvsimulator.x86_64 appletvos.arm64
-CFLAGS-tvOS=		-mtvos-version-min=9.0
+TARGETS-tvOS=appletvsimulator.x86_64 appletvos.arm64
+CFLAGS-tvOS=-mtvos-version-min=9.0
 CFLAGS-appletvos.arm64=	-fembed-bitcode
 PYTHON_CONFIGURE-tvOS=	ac_cv_func_sigaltstack=no
 
 # watchOS targets
-TARGETS-watchOS=	watchsimulator.i386 watchos.armv7k
-CFLAGS-watchOS=		-mwatchos-version-min=2.0
+TARGETS-watchOS=watchsimulator.i386 watchos.armv7k
+CFLAGS-watchOS=-mwatchos-version-min=2.0
 CFLAGS-watchos.armv7k=	-fembed-bitcode
 PYTHON_CONFIGURE-watchOS=ac_cv_func_sigaltstack=no
 
 # override machine for arm64
-MACHINE-arm64=		aarch64
+MACHINE-arm64=aarch64
 
-all: $(foreach os,$(OS),all-$(os))
+all: $(foreach os,$(OS),$(os))
 
 # Clean all builds
 clean:
@@ -95,8 +95,8 @@ downloads/Python-$(PYTHON_VERSION).tgz:
 	mkdir -p downloads
 	if [ ! -e downloads/Python-$(PYTHON_VERSION).tgz ]; then curl -L https://www.python.org/ftp/python/$(PYTHON_VERSION)/Python-$(PYTHON_VERSION).tgz > downloads/Python-$(PYTHON_VERSION).tgz; fi
 
-PYTHON_DIR-host=	build/Python-$(PYTHON_VERSION)-host
-PYTHON_HOST=		$(PYTHON_DIR-host)/dist/bin/python$(PYTHON_VER)
+PYTHON_DIR-host=build/Python-$(PYTHON_VERSION)-host
+PYTHON_HOST=$(PYTHON_DIR-host)/dist/bin/python$(PYTHON_VER)
 
 Python-host: $(PYTHON_HOST)
 
@@ -174,9 +174,6 @@ $$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz $(PYTHON_HOST
 	tar zxf downloads/Python-$(PYTHON_VERSION).tgz --strip-components 1 -C $$(PYTHON_DIR-$1)
 	# Apply target Python patches
 	cd $$(PYTHON_DIR-$1) && patch -p1 <$(PROJECT_DIR)/patch/Python/Python.patch
-ifeq ($$(findstring iphone,$$(SDK-$1)),)
-	cd $$(PYTHON_DIR-$1) && patch -p1 <$(PROJECT_DIR)/patch/Python/Python-tvos.patch
-endif
 	cp -f $(PROJECT_DIR)/patch/Python/Setup.embedded $$(PYTHON_DIR-$1)/Modules/Setup.embedded
 	# Configure target Python
 	cd $$(PYTHON_DIR-$1) && PATH=$(PROJECT_DIR)/$(PYTHON_DIR-host)/dist/bin:$(PATH) ./configure \
@@ -223,7 +220,7 @@ OPENSSL_FRAMEWORK-$1=	build/$1/OpenSSL.framework
 PYTHON_FRAMEWORK-$1=	build/$1/Python.framework
 PYTHON_RESOURCES-$1=	$$(PYTHON_FRAMEWORK-$1)/Versions/$(PYTHON_VER)/Resources
 
-all-$1: dist/Python-$(PYTHON_VERSION)-$1-support.b$(BUILD_NUMBER).tar.gz
+$1: dist/Python-$(PYTHON_VERSION)-$1-support.b$(BUILD_NUMBER).tar.gz
 
 clean-$1:
 	rm -rf build/$1
@@ -283,7 +280,7 @@ ifneq ($(TEST),)
 else
 	mkdir -p $$(PYTHON_RESOURCES-$1)/lib
 	cd $$(PYTHON_DIR-$$(firstword $$(TARGETS-$1)))/dist/lib/python$(PYTHON_VER) && \
-		zip -x@$(PROJECT_DIR)/python-lib-exclude.lst -r $(PROJECT_DIR)/$$(PYTHON_RESOURCES-$1)/lib/python$(subst .,,$(PYTHON_VER)) *
+		zip -x@$(PROJECT_DIR)/patch/Python/lib-exclude.lst -r $(PROJECT_DIR)/$$(PYTHON_RESOURCES-$1)/lib/python$(subst .,,$(PYTHON_VER)) *
 endif
 
 	# Copy fat library

README.rst

@@ -1,49 +1,46 @@
-Makefile glue for Python for iOS, tvOS and watchOS.
-
-Useful targets:
-
-* all                           - build all
-* all-iOS			- build everything for iOS
-* all-tvOS			- build everything for tvOS
-* all-watchOS			- build everything for watchOS
-* OpenSSL.framework-iOS	        - build OpenSSL.framework for iOS
-* OpenSSL.framework-tvOS	- build OpenSSL.framework for tvOS
-* OpenSSL.framework-watchOS	- build OpenSSL.framework for watchOS
-* Python.framework-iOS	        - build Python.framework for iOS
-* Python.framework-tvOS	        - build Python.framework for tvOS
-* Python.framework-watchOS	- build Python.framework for watchOS
-* Python-host			- build host python
-
 Python iOS Support
 ==================
 
 This is a meta-package for building a version of Python that can be embedded
-into an iOS project.
+into an iOS, tvOS or watchOS project.
 
 It works by downloading, patching, and building a fat binary OpenSSL and
 Python, and packaging them both in iOS Framework format.
 
 The binaries support the ``$(ARCHS_STANDARD)`` set - that is, armv7 and
-arm64. This should enable the code to run on:
+arm64 for iOS devices, arm64 for appleTV devices, and armv7k for watchOS.
+This should enable the code to run on:
 
 * iPhone
     - iPhone 4s
     - iPhone 5
+    - iPhone 5c
     - iPhone 5s
     - iPhone 6
     - iPhone 6 Plus
+    - iPhone 6s
+    - iPhone 6s Plus
+* iPad Pro
 * iPad
     - iPad 2
     - iPad (3rd gen)
     - iPad (4th gen)
     - iPad Air
+    - iPad Air 2
     - iPad retina
+    - iPad Pro
 * iPad Mini
     - iPad Mini (1st gen)
-    - iPad Mini (2nd gen)
+    - iPad Mini 2
+    - iPad Mini 3
+    - iPad Mini 4
 * iPod Touch
     - iPod Touch (4th gen)
     - iPod Touch (5th gen)
+    - iPod Touch (6th gen)
+* Apple TV
+    - 4th gen
+* Apple Watch
 
 This repository branch builds a packaged version of **Python 3.4.2**.
 Other Python versions are available by cloning other branches of the main
@@ -52,23 +49,29 @@ repository.
 Quickstart
 ----------
 
-Pre-built versions of the frameworks can be downloaded_, and added to
-your iOS project.
+Pre-built versions of the frameworks can be downloaded `for iOS`_,
+`for tvOS`_, and `for watchOS`_, and added to your project.
 
 Alternatively, to build the frameworks on your own, download/clone this
 repository, and then in the root directory, and run:
 
-    $ make
+* `make` (or `make all`) to build everything.
+* `make iOS` to build everything for iOS.
+* `make tvOS` to build everything for tvOS.
+* `make watchOS` to build everything for watchOS.
 
 This should:
 
 1. Download the original source packages
-2. Patch them as required for iOS compatibility
-3. Build the packages as iOS frameworks.
+2. Patch them as required for compatibility with the selected OS
+3. Build the packages as XCode-compatible frameworks.
 
-The build products will be in the `build` directory.
+The build products will be in the `build` directory; the compiled frameworks
+will be in the `dist` directory.
 
-.. _downloaded: https://github.com/pybee/Python-iOS-support/releases/download/3.4.2-b2/Python-3.4.2-iOS-support.b2.tar.gz
+.. _for iOS: https://github.com/pybee/Python-iOS-support/releases/download/3.4.2-b4/Python-3.4.2-iOS-support.b4.tar.gz
+.. _for tvOS: https://github.com/pybee/Python-iOS-support/releases/download/3.4.2-b4/Python-3.4.2-iOS-support.b4.tar.gz
+.. _for watchS: https://github.com/pybee/Python-iOS-support/releases/download/3.4.2-b4/Python-3.4.2-iOS-support.b4.tar.gz
 
 Acknowledgements
 ----------------

patch/Python/Python-tvos.patch

@@ -30904,6 +30904,38 @@ diff -Nru orig/Modules/_ctypes/libffi_ios/x86/unix64_x86_64.S modified/Modules/_
 +
 +#endif
 \ No newline at end of file
+diff -Nru orig/Modules/_posixsubprocess.c modified/Modules/_posixsubprocess.c
+--- orig/Modules/_posixsubprocess.c	2015-02-03 19:49:04.000000000 +0800
++++ modified/Modules/_posixsubprocess.c	2015-12-21 13:03:32.000000000 +0800
+@@ -479,11 +479,15 @@
+     saved_errno = 0;
+     for (i = 0; exec_array[i] != NULL; ++i) {
+         const char *executable = exec_array[i];
++#if defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) || defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
++	errno = ENOTSUP;
++#else
+         if (envp) {
+             execve(executable, argv, envp);
+         } else {
+             execv(executable, argv);
+         }
++#endif
+         if (errno != ENOENT && errno != ENOTDIR && saved_errno == 0) {
+             saved_errno = errno;
+         }
+@@ -646,7 +650,12 @@
+         cwd_obj2 = NULL;
+     }
+ 
++#if defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) || defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
++    pid = -1;
++    errno = ENOTSUP;
++#else
+     pid = fork();
++#endif
+     if (pid == 0) {
+         /* Child process */
+         /*
 diff -Nru orig/Modules/makesetup modified/Modules/makesetup
 --- orig/Modules/makesetup	2015-02-03 19:49:04.000000000 +0800
 +++ modified/Modules/makesetup	2015-06-28 14:39:04.000000000 +0800
@@ -30989,7 +31021,7 @@ diff -Nru orig/Modules/mathmodule.c modified/Modules/mathmodule.c
      r = hypot(x, y);
 diff -Nru orig/Modules/posixmodule.c modified/Modules/posixmodule.c
 --- orig/Modules/posixmodule.c	2015-02-03 19:49:04.000000000 +0800
-+++ modified/Modules/posixmodule.c	2015-05-04 12:44:34.000000000 +0800
++++ modified/Modules/posixmodule.c	2015-12-21 13:03:32.000000000 +0800
 @@ -20,6 +20,8 @@
  #  pragma weak statvfs
  #  pragma weak fstatvfs
@@ -31023,6 +31055,38 @@ diff -Nru orig/Modules/posixmodule.c modified/Modules/posixmodule.c
 
  /*[clinic input]
  module os
+@@ -1178,7 +1197,9 @@
+ #include <crt_externs.h>
+ static char **environ;
+ #elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
++#if !defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && !defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
+ extern char **environ;
++#endif
+ #endif /* !_MSC_VER */
+ 
+ static PyObject *
+@@ -1229,7 +1250,7 @@
+         Py_DECREF(k);
+         Py_DECREF(v);
+     }
+-#else
++#elif !defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && !defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
+     if (environ == NULL)
+         return d;
+     /* This part ignores errors */
+@@ -4444,7 +4465,12 @@
+ 
+     command = PyBytes_AsString(command_obj);
+     Py_BEGIN_ALLOW_THREADS
++#if defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) || defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
++    sts = -1;
++    errno = ENOTSUP;
++#else
+     sts = system(command);
++#endif
+     Py_END_ALLOW_THREADS
+     Py_DECREF(command_obj);
+ #endif
 diff -Nru orig/Modules/pwdmodule.c modified/Modules/pwdmodule.c
 --- orig/Modules/pwdmodule.c	2015-02-03 19:49:04.000000000 +0800
 +++ modified/Modules/pwdmodule.c	2015-05-02 23:37:06.000000000 +0800