Merge branch 'dev' into 3.10

Author: freakboy3742

.github/workflows/release.yaml

@@ -68,6 +68,10 @@ jobs:
         echo "TAG=${TAG}" >> $GITHUB_ENV
         echo "PY_VERSION=${TAG_VERSION}" >> $GITHUB_ENV
         echo "BUILD_NUMBER=${TAG_BUILD}" >> $GITHUB_ENV
+    - name: Set up Python
+      uses: actions/setup-python@v3.1.2
+      with:
+        python-version: ${{ env.TAG_VERSION }}
     - name: Build ${{ matrix.target }}
       env:
         BUILD_NUMBER: ${{ env.BUILD_NUMBER }}

Makefile

@@ -239,6 +239,17 @@ clean-Python:
 		build/*/Support/Python.xcframework \
 		build/*/Support/Python
 
+dev-clean-Python:
+	@echo ">>> Partially clean Python build products to the point where local code modifications can be made"
+	rm -rf \
+		dist/Python-$(PYTHON_VER)-* \
+		build/*/Python-$(PYTHON_VERSION)-*/python.exe \
+		build/*/Python-$(PYTHON_VERSION)-*/_install \
+		build/*/python \
+		build/*/python-*.log \
+		build/*/Support/Python.xcframework \
+		build/*/Support/Python
+
 # Download original Python source code archive.
 downloads/Python-$(PYTHON_VERSION).tgz:
 	@echo ">>> Download Python sources"
@@ -455,7 +466,6 @@ $$(PYTHON_DIR-$(target))/Makefile: \
 		$$(XZ_XCFRAMEWORK-$(os)) \
 		$$(OPENSSL_XCFRAMEWORK-$(os)) \
 		$$(LIBFFI_XCFRAMEWORK-$(os)) \
-		$$(PYTHON_XCFRAMEWORK-macOS) \
 		downloads/Python-$(PYTHON_VERSION).tgz
 	@echo ">>> Unpack and configure Python for $(target)"
 	mkdir -p $$(PYTHON_DIR-$(target))
@@ -733,16 +743,15 @@ ifneq ($(os),macOS)
 LIBFFI_XCFRAMEWORK-$(os)=build/$(os)/Support/libFFI.xcframework
 LIBFFI_DIR-$(os)=build/$(os)/libffi-$(LIBFFI_VERSION)
 
-$$(LIBFFI_DIR-$(os))/darwin_common/include/ffi.h: downloads/libffi-$(LIBFFI_VERSION).tgz $$(PYTHON_XCFRAMEWORK-macOS)
+$$(LIBFFI_DIR-$(os))/darwin_common/include/ffi.h: downloads/libffi-$(LIBFFI_VERSION).tgz
 	@echo ">>> Unpack and configure libFFI sources on $(os)"
 	mkdir -p $$(LIBFFI_DIR-$(os))
 	tar zxf downloads/libffi-$(LIBFFI_VERSION).tgz --strip-components 1 -C $$(LIBFFI_DIR-$(os))
 	# Patch the build to add support for new platforms
 	cd $$(LIBFFI_DIR-$(os)) && patch -p1 < $(PROJECT_DIR)/patch/libffi.patch
 	# Configure the build
 	cd $$(LIBFFI_DIR-$(os)) && \
-		PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin:$(PATH) \
-		python3 generate-darwin-source-and-headers.py --only-$(shell echo $(os) | tr '[:upper:]' '[:lower:]') \
+		python$(PYTHON_VER) generate-darwin-source-and-headers.py --only-$(shell echo $(os) | tr '[:upper:]' '[:lower:]') \
 		2>&1 | tee -a ../libffi-$(os).config.log
 
 $$(LIBFFI_XCFRAMEWORK-$(os)): $$(foreach sdk,$$(SDKS-$(os)),$$(LIBFFI_FATLIB-$$(sdk)))

patch/Python/Setup.iOS

@@ -37,3 +37,13 @@ _decimal _decimal/_decimal.c \
     _decimal/libmpdec/transpose.c \
     -I$(srcdir)/Modules/_decimal/libmpdec \
     -DCONFIG_64 -DANSI -DHAVE_UINT128_T
+
+#####################################################################
+# DISABLED Modules that require additional frameworks
+#####################################################################
+
+*disabled*
+
+_curses
+_curses_panel
+_posixshmem

patch/Python/Setup.tvOS

@@ -37,3 +37,13 @@ _decimal _decimal/_decimal.c \
     _decimal/libmpdec/transpose.c \
     -I$(srcdir)/Modules/_decimal/libmpdec \
     -DCONFIG_64 -DANSI -DHAVE_UINT128_T
+
+#####################################################################
+# DISABLED Modules that require additional frameworks
+#####################################################################
+
+*disabled*
+
+_curses
+_curses_panel
+_posixshmem

patch/Python/Setup.watchOS

@@ -19,3 +19,13 @@ _ctypes _ctypes/_ctypes.c \
     -DUSING_MALLOC_CLOSURE_DOT_C \
     -L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
     -lFFI
+
+#####################################################################
+# DISABLED Modules that require additional frameworks
+#####################################################################
+
+*disabled*
+
+_curses
+_curses_panel
+_posixshmem

patch/libffi.patch

@@ -279,3 +279,42 @@ index 9921b0d..5b60ccc 100755
 
      mkdir_p('darwin_common/include')
      for header_name, tag_tuples in platform_headers.items():
+diff --git a/src/closures.c b/src/closures.c
+index f7bead6..db7ec94 100644
+--- a/src/closures.c
++++ b/src/closures.c
+@@ -134,7 +134,7 @@ ffi_tramp_is_present (__attribute__((unused)) void *ptr)
+ #  define HAVE_MNTENT 1
+ # endif
+ # if defined(_WIN32) || defined(__OS2__)
+-/* Windows systems may have Data Execution Protection (DEP) enabled, 
++/* Windows systems may have Data Execution Protection (DEP) enabled,
+    which requires the use of VirtualMalloc/VirtualFree to alloc/free
+    executable memory. */
+ #  define FFI_MMAP_EXEC_WRIT 1
+@@ -230,12 +230,24 @@ ffi_trampoline_table_alloc (void)
+   kt = vm_remap (mach_task_self (), &trampoline_page, PAGE_MAX_SIZE, 0x0,
+ 		 VM_FLAGS_OVERWRITE, mach_task_self (), trampoline_page_template,
+ 		 FALSE, &cur_prot, &max_prot, VM_INHERIT_SHARE);
+-  if (kt != KERN_SUCCESS || !(cur_prot & VM_PROT_EXECUTE))
++  if (kt != KERN_SUCCESS)
+     {
+       vm_deallocate (mach_task_self (), config_page, PAGE_MAX_SIZE * 2);
+       return NULL;
+     }
+ 
++  if (!(cur_prot & VM_PROT_EXECUTE))
++    {
++      /* If VM_PROT_EXECUTE isn't set on the remapped trampoline page, set it */
++      kt = vm_protect (mach_task_self (), trampoline_page, PAGE_MAX_SIZE,
++         FALSE, cur_prot | VM_PROT_EXECUTE);
++      if (kt != KERN_SUCCESS)
++        {
++          vm_deallocate (mach_task_self (), config_page, PAGE_MAX_SIZE * 2);
++          return NULL;
++        }
++    }
++
+   /* We have valid trampoline and config pages */
+   table = calloc (1, sizeof (ffi_trampoline_table));
+   table->free_count = FFI_TRAMPOLINE_COUNT;