Make better use of makesetup directives in module configuration.

Author: freakboy3742

Makefile

@@ -232,6 +232,7 @@ downloads/libffi-$(LIBFFI_VERSION).tgz:
 clean-Python:
 	@echo ">>> Clean Python build products"
 	rm -rf \
+		dist/Python-$(PYTHON_VER)-* \
 		build/*/Python-$(PYTHON_VERSION)-* \
 		build/*/python \
 		build/*/python-*.log \
@@ -469,11 +470,11 @@ $$(PYTHON_DIR-$(target))/Makefile: \
 			> $$(PYTHON_DIR-$(target))/Modules/Setup.local
 	# Configure target Python
 	cd $$(PYTHON_DIR-$(target)) && \
-		PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin:$(PATH) \
 		./configure \
 			CC="$$(CC-$(target))" LD="$$(CC-$(target))" \
 			--host=$$(MACHINE_DETAILED-$(target))-apple-$(shell echo $(os) | tr '[:upper:]' '[:lower:]') \
 			--build=$(HOST_ARCH)-apple-darwin \
+			--with-build-python=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin/python$(PYTHON_VER) \
 			--prefix="$(PROJECT_DIR)/$$(PYTHON_DIR-$(target))/_install" \
 			--without-doc-strings --enable-ipv6 --without-ensurepip \
 			--with-openssl=../openssl/$$(SDK-$(target)) \
@@ -484,14 +485,12 @@ $$(PYTHON_DIR-$(target))/Makefile: \
 $$(PYTHON_DIR-$(target))/python.exe: $$(PYTHON_DIR-$(target))/Makefile
 	@echo ">>> Build Python for $(target)"
 	cd $$(PYTHON_DIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin:$(PATH)" \
 		make all \
 		2>&1 | tee -a ../python-$(target).build.log
 
 $$(PYTHON_LIB-$(target)): $$(PYTHON_DIR-$(target))/python.exe
 	@echo ">>> Install Python for $(target)"
 	cd $$(PYTHON_DIR-$(target)) && \
-		PATH="$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin:$(PATH)" \
 		make install \
 		2>&1 | tee -a ../python-$(target).install.log
 

patch/Python/Python.patch

@@ -1500,10 +1500,31 @@ index 44974d433b..ae4e18802b 100755
  #
  # Platform support for Windows
 diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
-index 9132f13e81..c6901a31d5 100644
+index 9132f13e81..36e00f7bfd 100644
 --- a/Modules/_posixsubprocess.c
 +++ b/Modules/_posixsubprocess.c
-@@ -660,11 +660,15 @@
+@@ -31,10 +31,20 @@
+ 
+ #include "posixmodule.h"
+ 
++#if defined(__APPLE__)
++#include "TargetConditionals.h"
++#endif
++
+ #ifdef _Py_MEMORY_SANITIZER
+ # include <sanitizer/msan_interface.h>
+ #endif
+ 
++// iOS/tvOS/watchOS *define* a number of POSIX functions, but you can't use them
++// because they aren't conventional multiprocess environments.
++#if TARGET_OS_IPHONE
++#  undef HAVE_FORK
++#endif
++
+ #if defined(__ANDROID__) && __ANDROID_API__ < 21 && !defined(SYS_getdents64)
+ # include <sys/linux-syscalls.h>
+ # define SYS_getdents64  __NR_getdents64
+@@ -660,11 +670,15 @@
      saved_errno = 0;
      for (i = 0; exec_array[i] != NULL; ++i) {
          const char *executable = exec_array[i];
@@ -1519,18 +1540,93 @@ index 9132f13e81..c6901a31d5 100644
          if (errno != ENOENT && errno != ENOTDIR && saved_errno == 0) {
              saved_errno = errno;
          }
-@@ -751,7 +755,11 @@
+@@ -730,7 +744,9 @@
+              PyObject *preexec_fn,
+              PyObject *preexec_fn_args_tuple)
+ {
+-
++/* iOS/tvOS/watchOS define the existence of fork, but it cannot be invoked;
++ * so fail fast if any attempt is made to invoke fork_exec */
++#ifdef HAVE_FORK
+     pid_t pid;
+ 
+ #ifdef VFORK_USABLE
+@@ -749,7 +765,7 @@
+             pid = fork();
+         }
      } else
- #endif
+-#endif
++#endif /* VFORK_USABLE */
      {
-+#if defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) || defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
-+        pid = -1;
-+#else
          pid = fork();
-+#endif
      }
- 
+@@ -757,7 +773,6 @@
      if (pid != 0) {
+         return pid;
+     }
+-
+     /* Child process.
+      * See the comment above child_exec() for restrictions imposed on
+      * the code below.
+@@ -780,6 +795,9 @@
+                py_fds_to_keep, preexec_fn, preexec_fn_args_tuple);
+     _exit(255);
+     return 0;  /* Dead code to avoid a potential compiler warning. */
++#else /* HAVE_FORK */
++    return -1;
++#endif /* HAVE_FORK */
+ }
+ 
+ 
+@@ -810,7 +828,9 @@
+     int need_after_fork = 0;
+     int saved_errno = 0;
+     int allow_vfork;
+-
++/* iOS/tvOS/watchOS define the existence of fork, but it cannot be invoked;
++ * so fail fast if any attempt is made to invoke fork_exec */
++#ifdef HAVE_FORK
+     if (!PyArg_ParseTuple(
+             args, "OOpO!OOiiiiiiiiii" _Py_PARSE_PID "OOOiOp:fork_exec",
+             &process_args, &executable_list,
+@@ -982,7 +1002,6 @@
+         goto cleanup;
+ #endif /* HAVE_SETREUID */
+     }
+-
+     /* This must be the last thing done before fork() because we do not
+      * want to call PyOS_BeforeFork() if there is any chance of another
+      * error leading to the cleanup: code without calling fork(). */
+@@ -1017,7 +1036,7 @@
+         }
+         old_sigmask = &old_sigs;
+     }
+-#endif
++#endif /* VFORK_USABLE */
+ 
+     pid = do_fork_exec(exec_array, argv, envp, cwd,
+                        p2cread, p2cwrite, c2pread, c2pwrite,
+@@ -1049,7 +1068,7 @@
+          * the thread signal mask. */
+         (void) pthread_sigmask(SIG_SETMASK, old_sigmask, NULL);
+     }
+-#endif
++#endif /* VFORK_USABLE */
+ 
+     if (need_after_fork)
+         PyOS_AfterFork_Parent();
+@@ -1078,8 +1097,10 @@
+         PyGC_Enable();
+     }
+     Py_XDECREF(gc_module);
+-
+     return pid == -1 ? NULL : PyLong_FromPid(pid);
++#else /* HAVE_FORK */
++    return NULL;
++#endif
+ }
+ 
+ 
 diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
 index 08c40834c4..5c110d7211 100644
 --- a/Modules/faulthandler.c
@@ -1556,7 +1652,7 @@ index 08c40834c4..5c110d7211 100644
     and sigaction() SA_ONSTACK */
  #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
 diff --git a/Modules/makesetup b/Modules/makesetup
-index 9b20e3c9f6..196ff69984 100755
+index 9b20e3c9f6..23be532f6a 100755
 --- a/Modules/makesetup
 +++ b/Modules/makesetup
 @@ -166,7 +166,7 @@
@@ -1576,7 +1672,25 @@ index 9b20e3c9f6..196ff69984 100755
  			\$\(*_CFLAGS\))		cpps="$cpps $arg";;
  			\$\(*_INCLUDES\))	cpps="$cpps $arg";;
  			\$\(*_LIBS\))		libs="$libs $arg";;
-@@ -245,6 +246,7 @@
+@@ -220,7 +221,16 @@
+ 		done
+ 		case $doconfig in
+ 		yes)
+-			LIBS="$LIBS $libs"
++			# sed has a character limit for multiline substitutions on some
++			# installs. If you have a lot of customized module configurations,
++			# the LOCALMODLIBS definition can end up exceeding that line length.
++			# To ensure this doesn't happen, only include $libs if it adds
++			# something, and put each library definition on it's own line. This
++			# requires escaping for when this script runs, and escaping for when
++			# the output is run through sed.
++			if test "$libs"; then
++				LIBS="$LIBS \\\\\\\\\\$NL\t$libs"
++			fi
+ 			MODS="$MODS $mods"
+ 			BUILT="$BUILT $mods"
+ 			;;
+@@ -245,6 +255,7 @@
  			*.C)   obj=`basename $src .C`.o; cc='$(CXX)';;
  			*.cxx) obj=`basename $src .cxx`.o; cc='$(CXX)';;
  			*.cpp) obj=`basename $src .cpp`.o; cc='$(CXX)';;
@@ -1600,7 +1714,7 @@ index aa93e756c6..fcf3784c2f 100644
     sin(pi*x), giving accurate results for all finite x (especially x
     integral or close to an integer).  This is here for use in the
 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-index 4015889441..3cacff0f3f 100644
+index 4015889441..b9d6633213 100644
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
 @@ -69,6 +69,8 @@
@@ -1617,7 +1731,7 @@ index 4015889441..3cacff0f3f 100644
  #endif  /* ! __WATCOMC__ || __QNX__ */
 
 +// iOS/tvOS/watchOS *define* a number of POSIX functions, but you can't use them
-+// because iOS isn't a conventional multiprocess environment.
++// because they aren't conventional multiprocess environment.
 +#if TARGET_OS_IPHONE
 +#  undef HAVE_EXECV
 +#  undef HAVE_FORK