Add universal2 (i.e., M1 hardware support) to the macOS build.

Author: freakboy3742

Makefile

@@ -50,7 +50,8 @@ LIBFFI_VERSION=3.3
 OS=macOS iOS tvOS watchOS
 
 # macOS targets
-TARGETS-macOS=macosx.x86_64
+TARGETS-macOS=macosx.x86_64 macosx.arm64
+PYTHON_TARGETS-macOS=macOS
 CFLAGS-macOS=-mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
 
 # iOS targets
@@ -176,7 +177,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-macOS=build/macOS/Python-$(PYTHON_VERSION)-macosx.x86_64
+# Some Python targets needed to identify the host build
+PYTHON_DIR-macOS=build/macOS/Python-$(PYTHON_VERSION)-macOS
 PYTHON_HOST=$(PYTHON_DIR-macOS)/dist/lib/libpython$(PYTHON_VER).a
 
 # Build for specified target (from $(TARGETS))
@@ -209,14 +211,6 @@ OPENSSL_DIR-$1=build/$2/openssl-$(OPENSSL_VERSION)-$1
 BZIP2_DIR-$1=build/$2/bzip2-$(BZIP2_VERSION)-$1
 XZ_DIR-$1=build/$2/xz-$(XZ_VERSION)-$1
 LIBFFI_DIR-$1=build/$2/libffi-$(LIBFFI_VERSION)
-PYTHON_DIR-$1=build/$2/Python-$(PYTHON_VERSION)-$1
-pyconfig.h-$1=pyconfig-$$(ARCH-$1).h
-
-ifeq ($2,macOS)
-PYTHON_HOST_DEP-$1=
-else
-PYTHON_HOST-$1=$(PYTHON_HOST)
-endif
 
 # Unpack OpenSSL
 $$(OPENSSL_DIR-$1)/Makefile: downloads/openssl-$(OPENSSL_VERSION).tgz
@@ -239,7 +233,7 @@ endif
 ifeq ($2,macOS)
 	cd $$(OPENSSL_DIR-$1) && \
 	CC="$$(CC-$1)" MACOSX_DEPLOYMENT_TARGET=$$(MACOSX_DEPLOYMENT_TARGET) \
-		./Configure darwin64-x86_64-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 --openssldir=$(PROJECT_DIR)/build/$2/openssl
 else
 	cd $$(OPENSSL_DIR-$1) && \
 		CC="$$(CC-$1)" \
@@ -288,9 +282,14 @@ $$(XZ_DIR-$1)/Makefile: downloads/xz-$(XZ_VERSION).tgz
 $$(XZ_DIR-$1)/src/liblzma/.libs/liblzma.a: $$(XZ_DIR-$1)/Makefile
 	cd $$(XZ_DIR-$1) && make && make install
 
-# No need to build libFFI on macOS
+# macOS builds use their own libFFI, and are compiled as a single
+# universal2 build. As a result, the macOS Python build is configured
+# in the `build` macro, rather than the `build-target` macro.
 ifneq ($2,macOS)
 LIBFFI_BUILD_DIR-$1=build_$$(SDK-$1)-$$(ARCH-$1)
+PYTHON_DIR-$1=build/$2/Python-$(PYTHON_VERSION)-$1
+pyconfig.h-$1=pyconfig-$$(ARCH-$1).h
+PYTHON_HOST-$1=$(PYTHON_HOST)
 
 # Build LibFFI
 $$(LIBFFI_DIR-$1)/libffi.$1.a: $$(LIBFFI_DIR-$1)/darwin_common
@@ -300,8 +299,6 @@ $$(LIBFFI_DIR-$1)/libffi.$1.a: $$(LIBFFI_DIR-$1)/darwin_common
 	# include the target in the final filename for disambiguation
 	cp $$(LIBFFI_DIR-$1)/$$(LIBFFI_BUILD_DIR-$1)/.libs/libffi.a $$(LIBFFI_DIR-$1)/libffi.$1.a
 
-endif
-
 # Unpack Python
 $$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz $$(PYTHON_HOST-$1)
 	# Unpack target Python
@@ -312,21 +309,14 @@ $$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz $$(PYTHON_HOS
 	# Copy in the embedded module configuration
 	cat $(PROJECT_DIR)/patch/Python/Setup.embedded $(PROJECT_DIR)/patch/Python/Setup.$2 > $$(PYTHON_DIR-$1)/Modules/Setup.local
 	# Configure target Python
-ifeq ($2,macOS)
-	cd $$(PYTHON_DIR-$1) && MACOSX_DEPLOYMENT_TARGET=$$(MACOSX_DEPLOYMENT_TARGET) ./configure \
-		--prefix=$(PROJECT_DIR)/$$(PYTHON_DIR-$1)/dist \
-		--without-doc-strings --enable-ipv6 --without-ensurepip \
-		$$(PYTHON_CONFIGURE-$2)
-else
 	cd $$(PYTHON_DIR-$1) && PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/dist/bin:$(PATH) ./configure \
 		CC="$$(CC-$1)" LD="$$(CC-$1)" \
 		--host=$$(MACHINE_DETAILED-$1)-apple-$(shell echo $2 | tr '[:upper:]' '[:lower:]') \
-		--build=x86_64-apple-darwin$(shell uname -r) \
+		--build=x86_64-apple-darwin \
 		--prefix=$(PROJECT_DIR)/$$(PYTHON_DIR-$1)/dist \
 		--without-doc-strings --enable-ipv6 --without-ensurepip \
 		ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no \
 		$$(PYTHON_CONFIGURE-$2)
-endif
 
 # Build Python
 $$(PYTHON_DIR-$1)/dist/lib/libpython$(PYTHON_VER).a: build/$2/Support/OpenSSL build/$2/Support/BZip2 build/$2/Support/XZ build/$2/Support/libFFI $$(PYTHON_DIR-$1)/Makefile
@@ -336,6 +326,8 @@ $$(PYTHON_DIR-$1)/dist/lib/libpython$(PYTHON_VER).a: build/$2/Support/OpenSSL bu
 build/$2/$$(pyconfig.h-$1): $$(PYTHON_DIR-$1)/dist/include/python$(PYTHON_VER)/pyconfig.h
 	cp -f $$^ $$@
 
+endif
+
 # Dump vars (for test)
 vars-$1:
 	@echo "ARCH-$1: $$(ARCH-$1)"
@@ -386,7 +378,7 @@ endif
 	echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/Support/VERSIONS
 	echo "XZ: $(XZ_VERSION)" >> build/$1/Support/VERSIONS
 ifeq ($1,macOS)
-	cp -r build/$1/Python-$(PYTHON_VERSION)-macosx.x86_64/dist build/$1/python
+	cp -r build/$1/Python-$(PYTHON_VERSION)-macOS/dist build/$1/python
 	mv build/$1/Support/VERSIONS build/$1/python/VERSIONS
 	tar zcvf $$@ -X patch/Python/exclude.macOS -C build/$1/python `ls -A build/$1/python`
 else
@@ -459,11 +451,42 @@ build/$1/xz/lib/liblzma.a: $$(foreach target,$$(TARGETS-$1),$$(XZ_DIR-$$(target)
 # Build libFFI
 libFFI-$1: $$(LIBFFI_FRAMEWORK-$1)
 
+# macOS builds a single Python universal2 target; thus it needs to be
+# configured in the `build` macro, not the `build-target` macro.
+# macOS also uses the system-provided libFFI, so there's no need to package
+# a libFFI framework for macOS.
 ifeq ($1,macOS)
-$$(LIBFFI_FRAMEWORK-$1):  # noop
-else
+# Some targets that are needed for consistency between macOS and other builds,
+# but are no-ops on macOS.
+$$(LIBFFI_FRAMEWORK-$1):
+
+build/$1/$$(pyconfig.h-$1):
+
+# Unpack Python
+$$(PYTHON_DIR-$1)/Makefile: downloads/Python-$(PYTHON_VERSION).tgz
+	# Unpack target Python
+	mkdir -p $$(PYTHON_DIR-$1)
+	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
+	# Copy in the embedded module configuration
+	cat $(PROJECT_DIR)/patch/Python/Setup.embedded $(PROJECT_DIR)/patch/Python/Setup.$1 > $$(PYTHON_DIR-$1)/Modules/Setup.local
+	# Configure target Python
+	cd $$(PYTHON_DIR-$1) && MACOSX_DEPLOYMENT_TARGET=$$(MACOSX_DEPLOYMENT_TARGET) ./configure \
+		--prefix=$(PROJECT_DIR)/$$(PYTHON_DIR-$1)/dist \
+		--without-doc-strings --enable-ipv6 --without-ensurepip --enable-universalsdk --with-universal-archs=universal2 \
+		$$(PYTHON_CONFIGURE-$1)
+
+# Build Python
+$$(PYTHON_DIR-$1)/dist/lib/libpython$(PYTHON_VER).a: build/$1/Support/OpenSSL build/$1/Support/BZip2 build/$1/Support/XZ build/$1/Support/libFFI $$(PYTHON_DIR-$1)/Makefile
+	# Build target Python
+	cd $$(PYTHON_DIR-$1) && PATH="$(PROJECT_DIR)/$(PYTHON_DIR-$1)/dist/bin:$(PATH)" make all install
 
+else
+# The LibFFI folder is shared between all architectures for the OS
 LIBFFI_DIR-$1=build/$1/libffi-$(LIBFFI_VERSION)
+# The Python targets are the same as they are for every other library
+PYTHON_TARGETS-$1=$$(TARGETS-$1)
 
 # Unpack LibFFI and generate source & headers
 $$(LIBFFI_DIR-$1)/darwin_common: downloads/libffi-$(LIBFFI_VERSION).tgz
@@ -472,8 +495,9 @@ $$(LIBFFI_DIR-$1)/darwin_common: downloads/libffi-$(LIBFFI_VERSION).tgz
 	tar zxf downloads/libffi-$(LIBFFI_VERSION).tgz --strip-components 1 -C $$(LIBFFI_DIR-$1)
 	# Apply libffi patches. Apple builds of libffi use a utility script; that
 	# script doesn't work with Python3 using the out-of-the-box version in
-	# libffi 3.3. This patch matches what is in trunk as of Feb 2021 (and will
-	# presumably be in libffi 3.4 or whatever comes next)
+	# libffi 3.3. This patch adds some changes that will be included in libFFI
+	# 3.4 (whenever that is released), plus some extra targets to support
+	# tvOS and watchOS.
 	cd $$(LIBFFI_DIR-$1) && patch -p1 < $(PROJECT_DIR)/patch/libffi/libffi.patch
 	# Configure the build
 	cd $$(LIBFFI_DIR-$1) && python generate-darwin-source-and-headers.py --only-$(shell echo $1 | tr '[:upper:]' '[:lower:]')
@@ -500,32 +524,30 @@ $1: Python-$1
 Python-$1: dist/Python-$(PYTHON_VER)-$1-support.$(BUILD_NUMBER).tar.gz
 
 # Build Python
-$$(PYTHON_FRAMEWORK-$1): build/$1/libpython$(PYTHON_VER).a $$(foreach target,$$(TARGETS-$1),build/$1/$$(pyconfig.h-$$(target)))
+$$(PYTHON_FRAMEWORK-$1): build/$1/libpython$(PYTHON_VER).a $$(foreach target,$$(PYTHON_TARGETS-$1),build/$1/$$(pyconfig.h-$$(target)))
 	mkdir -p $$(PYTHON_RESOURCES-$1)/include/python$(PYTHON_VER)
 
 	# Copy the headers. The headers are the same for every platform, except for pyconfig.h
 	# We ship a master pyconfig.h for iOS, tvOS and watchOS that delegates to architecture
 	# specific versions; on macOS, we can use the original version as-is.
-	cp -f -r $$(PYTHON_DIR-$$(firstword $$(TARGETS-$1)))/dist/include/python$(PYTHON_VER) $$(PYTHON_FRAMEWORK-$1)/Headers
+	cp -f -r $$(PYTHON_DIR-$$(firstword $$(PYTHON_TARGETS-$1)))/dist/include/python$(PYTHON_VER) $$(PYTHON_FRAMEWORK-$1)/Headers
+ifneq ($1,macOS)
 	cp -f $$(filter %.h,$$^) $$(PYTHON_FRAMEWORK-$1)/Headers
-ifeq ($1,macOS)
-	mv $$(PYTHON_FRAMEWORK-$1)/Headers/pyconfig-x86_64.h $$(PYTHON_FRAMEWORK-$1)/Headers/pyconfig.h
-else
 	cp -f $(PROJECT_DIR)/patch/Python/pyconfig-$1.h $$(PYTHON_FRAMEWORK-$1)/Headers/pyconfig.h
 endif
 	# Copy Python.h and pyconfig.h into the resources include directory
 	cp -f -r $$(PYTHON_FRAMEWORK-$1)/Headers/pyconfig*.h $$(PYTHON_RESOURCES-$1)/include/python$(PYTHON_VER)
 	cp -f -r $$(PYTHON_FRAMEWORK-$1)/Headers/Python.h $$(PYTHON_RESOURCES-$1)/include/python$(PYTHON_VER)
 
 	# Copy the standard library from the simulator build
-	cp -f -r $$(PYTHON_DIR-$$(firstword $$(TARGETS-$1)))/dist/lib $$(PYTHON_RESOURCES-$1)
+	cp -f -r $$(PYTHON_DIR-$$(firstword $$(PYTHON_TARGETS-$1)))/dist/lib $$(PYTHON_RESOURCES-$1)
 
 	# Copy fat library
 	cp -f $$(filter %.a,$$^) $$(PYTHON_FRAMEWORK-$1)/libPython.a
 
 
 # Build libpython fat library
-build/$1/libpython$(PYTHON_VER).a: $$(foreach target,$$(TARGETS-$1),$$(PYTHON_DIR-$$(target))/dist/lib/libpython$(PYTHON_VER).a)
+build/$1/libpython$(PYTHON_VER).a: $$(foreach target,$$(PYTHON_TARGETS-$1),$$(PYTHON_DIR-$$(target))/dist/lib/libpython$(PYTHON_VER).a)
 	# Create a fat binary for the libPython library
 	mkdir -p build/$1
 	xcrun lipo -create -output $$@ $$^
@@ -538,6 +560,7 @@ vars-$1: $$(foreach target,$$(TARGETS-$1),vars-$$(target))
 	@echo "PYTHON_FRAMEWORK-$1: $$(PYTHON_FRAMEWORK-$1)"
 	@echo "LIBFFI_DIR-$1: $$(LIBFFI_DIR-$1)"
 	@echo "PYTHON_RESOURCES-$1: $$(PYTHON_RESOURCES-$1)"
+	@echo "PYTHON_TARGETS-$1: $$(PYTHON_TARGETS-$1)"
 
 endef