Merge branch 'dev' into 3.6

beeware · Jul 31, 2021 · 8167b38 · 8167b38
2 parents ccc20a5 + cb7e5fe
commit 8167b38
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,11 @@ BUILD_NUMBER=custom
 MACOSX_DEPLOYMENT_TARGET=10.8
 
 # Version of packages that will be compiled by this meta-package
+# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
+# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
+# PYTHON_VER is the major/minor version (e.g., 3.10)
 PYTHON_VERSION=3.6.14
+PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_VER=$(basename $(PYTHON_VERSION))
 
 OPENSSL_VERSION_NUMBER=1.0.2
@@ -156,7 +160,7 @@ clean-Python:
 # Download original Python source code archive.
 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
+	if [ ! -e downloads/Python-$(PYTHON_VERSION).tgz ]; then curl -L https://www.python.org/ftp/python/$(PYTHON_MICRO_VERSION)/Python-$(PYTHON_VERSION).tgz > downloads/Python-$(PYTHON_VERSION).tgz; fi
 
 # Some Python targets needed to identify the host build
 PYTHON_DIR-macOS=build/macOS/Python-$(PYTHON_VERSION)-macOS
@@ -212,13 +216,13 @@ endif
 ifeq ($2,macOS)
 	cd $$(OPENSSL_DIR-$1) && \
 	CC="$$(CC-$1)" MACOSX_DEPLOYMENT_TARGET=$$(MACOSX_DEPLOYMENT_TARGET) \
-		./Configure darwin64-$$(ARCH-$1)-cc no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl --openssldir=$(PROJECT_DIR)/build/$2/openssl
+		./Configure darwin64-$$(ARCH-$1)-cc no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl
 else
 	cd $$(OPENSSL_DIR-$1) && \
 		CC="$$(CC-$1)" \
 		CROSS_TOP="$$(dir $$(SDK_ROOT-$1)).." \
 		CROSS_SDK="$$(notdir $$(SDK_ROOT-$1))" \
-		./Configure iphoneos-cross no-asm no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl --openssldir=$(PROJECT_DIR)/build/$2/openssl
+		./Configure iphoneos-cross no-asm no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl
 endif
 
 # Build OpenSSL

diff --git a/README.rst b/README.rst
@@ -15,8 +15,8 @@ incorporated into an XCode project.
 The binaries support x86_64 for macOS; arm64 for iOS and appleTV devices;
 and armv7k for watchOS. This should enable the code to run on:
 
-* MacBook
-* iMac
+* MacBook (MacBooks using Apple Silicon will run under Rosetta x86 emulation)
+* iMac (iMacs using Apple Silicon will run under Rosetta x86 emulation)
 * Mac Pro
 * iPhone (5s or later)
 * iPad (5th gen or later)

diff --git a/patch/Python/Setup.embedded b/patch/Python/Setup.embedded
@@ -26,7 +26,7 @@ _heapq _heapqmodule.c
 _io -DPy_BUILD_CORE -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
 _json _json.c
 _locale _localemodule.c
-_lsprof _lsprof.o rotatingtree.c
+_lsprof _lsprof.c rotatingtree.c
 _lzma _lzmamodule.c -I$(srcdir)/../Support/XZ/Headers -L$(srcdir)/../Support/XZ/ -lxz
 _md5 md5module.c
 _multibytecodec cjkcodecs/multibytecodec.c
@@ -60,8 +60,8 @@ _symtable symtablemodule.c
 _thread -DPy_BUILD_CORE _threadmodule.c
 _tracemalloc _tracemalloc.c hashtable.c
 _weakref _weakref.c
-atexit atexitmodule.c
 array arraymodule.c
+atexit atexitmodule.c
 audioop audioop.c
 binascii binascii.c
 cmath cmathmodule.c _math.c
@@ -73,7 +73,7 @@ itertools itertoolsmodule.c
 math mathmodule.c
 mmap mmapmodule.c
 parser parsermodule.c
-posix -DPy_BUILD_CORE posixmodule.c
+posix posixmodule.c
 pwd pwdmodule.c
 pyexpat expat/xmlparse.c \
     expat/xmlrole.c \
@@ -106,7 +106,6 @@ zlib zlibmodule.c -I$(prefix)/include -lz
 #_curses_panel _curses_panel.c -lpanel -lncurses
 #_dbm _dbmmodule.c
 #_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
-#_scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
 #_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I... -L...
 #nis nismodule.c -lnsl
 #ossaudiodev

diff --git a/patch/Python/Setup.macOS-x86_64 b/patch/Python/Setup.macOS-x86_64
@@ -35,3 +35,5 @@ _decimal _decimal/_decimal.c \
     _decimal/libmpdec/transpose.c \
     -I$(srcdir)/Modules/_decimal/libmpdec \
     -DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
+
+_scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
diff --git a/patch/Python/release.common.exclude b/patch/Python/release.common.exclude
@@ -18,13 +18,7 @@ Python/Resources/lib/python*/lib2to3/tests
 Python/Resources/lib/python*/sqlite3/test
 Python/Resources/lib/python*/test
 # Remove compiled test and example modules.
-Python/Resources/lib/python*/lib-dynload/_test*.so
-Python/Resources/lib/python*/lib-dynload/_ctypes_test*.so
-Python/Resources/lib/python*/lib-dynload/xxlimited*.so
-Python/Resources/lib/python*/lib-dynload/_xx*.so
-# Remove wsgiref web app module; it's unusual that mobile apps would
-# start a web app server with it.
-Python/Resources/lib/python*/wsgiref
+Python/Resources/lib/python*/lib-dynload/*.so
 # Remove config-* directory, which is used for compiling C extension modules.
 Python/Resources/lib/python*/config-*
 # Remove ensurepip. If user code needs pip, it can add it to

diff --git a/patch/Python/release.iOS.exclude b/patch/Python/release.iOS.exclude
@@ -4,4 +4,3 @@
 #
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
-Python/Resources/lib/python*/lib-dynload/_curses*.so
diff --git a/patch/Python/release.tvOS.exclude b/patch/Python/release.tvOS.exclude
@@ -4,4 +4,3 @@
 #
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
-Python/Resources/lib/python*/lib-dynload/_curses*.so
diff --git a/patch/Python/release.watchOS.exclude b/patch/Python/release.watchOS.exclude
@@ -4,4 +4,3 @@
 #
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
-Python/Resources/lib/python*/lib-dynload/_curses*.so