Merge pull request #20853 from fuzzard/depends_python

[tools/depends] bump python 3.9.10

8 files changed, 21 insertions, 62 deletions

diff --git a/tools/depends/native/python3/Makefile b/tools/depends/native/python3/Makefile
index 7a0d7562d6..9b6a267a26 100644
--- a/tools/depends/native/python3/Makefile
+++ b/tools/depends/native/python3/Makefile
@@ -1,15 +1,9 @@
-include ../../Makefile.include
+include ../../Makefile.include PYTHON3-VERSION
 PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include Makefile 01-distutil-flags.patch
+DEPS= ../../Makefile.include Makefile PYTHON3-VERSION 01-distutil-flags.patch
 
-# lib name, version
-LIBNAME=Python
-VERSION=3.9.7
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
 CWD=$(shell pwd)
 HOSTPYTHONDIR=$(CWD)/$(PLATFORM)/hostpython
-BASE_URL=https://www.python.org/ftp/python/$(VERSION)
 
 CONFIGURE=./configure --prefix=$(NATIVEPREFIX) --disable-shared --disable-framework --without-pymalloc --with-system-ffi
 ifeq ($(OS),linux)
diff --git a/tools/depends/native/python3/PYTHON3-VERSION b/tools/depends/native/python3/PYTHON3-VERSION
new file mode 100644
index 0000000000..d8be2a18d2
--- /dev/null
+++ b/tools/depends/native/python3/PYTHON3-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=Python
+VERSION=3.9.10
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.xz
diff --git a/tools/depends/target/python3/01-GH-27394-move-crypt-h.patch b/tools/depends/target/python3/01-GH-27394-move-crypt-h.patch
deleted file mode 100644
index 352eaa48cd..0000000000
--- a/tools/depends/target/python3/01-GH-27394-move-crypt-h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Include/Python.h
-+++ b/Include/Python.h
-@@ -35,19 +35,6 @@
- #ifndef MS_WINDOWS
- #include <unistd.h>
- #endif
--#ifdef HAVE_CRYPT_H
--#if defined(HAVE_CRYPT_R) && !defined(_GNU_SOURCE)
--/* Required for glibc to expose the crypt_r() function prototype. */
--#  define _GNU_SOURCE
--#  define _Py_GNU_SOURCE_FOR_CRYPT
--#endif
--#include <crypt.h>
--#ifdef _Py_GNU_SOURCE_FOR_CRYPT
--/* Don't leak the _GNU_SOURCE define to other headers. */
--#  undef _GNU_SOURCE
--#  undef _Py_GNU_SOURCE_FOR_CRYPT
--#endif
--#endif
- 
- /* For size_t? */
- #ifdef HAVE_STDDEF_H
---- a/Modules/_cryptmodule.c
-+++ b/Modules/_cryptmodule.c
-@@ -4,6 +4,9 @@
- #include "Python.h"
- 
- #include <sys/types.h>
-+#ifdef HAVE_CRYPT_H
-+#include <crypt.h>
-+#endif
- 
- /* Module crypt */
- 
diff --git a/tools/depends/target/python3/Makefile b/tools/depends/target/python3/Makefile
index e1e35f8987..75acc933d1 100644
--- a/tools/depends/target/python3/Makefile
+++ b/tools/depends/target/python3/Makefile
@@ -1,13 +1,6 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile apple.patch crosscompile.patch android.patch \
-       modules.setup darwin_embedded.patch 01-GH-27394-move-crypt-h.patch
-
-# lib name, version
-LIBNAME=Python
-VERSION=3.9.7
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-BASE_URL=https://www.python.org/ftp/python/$(VERSION)
+include ../../Makefile.include PYTHON3-VERSION
+DEPS= ../../Makefile.include Makefile PYTHON3-VERSION apple.patch crosscompile.patch \
+       android.patch modules.setup darwin_embedded.patch
 
 ifeq ($(findstring apple-darwin, $(HOST)), apple-darwin)
   HOSTPLATFORM=_PYTHON_HOST_PLATFORM="darwin"
@@ -49,7 +42,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); patch -p1 -i ../crosscompile.patch
 	cd $(PLATFORM); patch -p1 -i ../android.patch
 	cd $(PLATFORM); patch -p1 -i ../apple.patch
-	cd $(PLATFORM); patch -p1 -i ../01-GH-27394-move-crypt-h.patch
 ifeq ($(OS),darwin_embedded)
 	cd $(PLATFORM); patch -p1 -i ../darwin_embedded.patch
 endif
diff --git a/tools/depends/target/python3/PYTHON3-VERSION b/tools/depends/target/python3/PYTHON3-VERSION
new file mode 100644
index 0000000000..d8be2a18d2
--- /dev/null
+++ b/tools/depends/target/python3/PYTHON3-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=Python
+VERSION=3.9.10
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.xz
diff --git a/tools/depends/target/python3/apple.patch b/tools/depends/target/python3/apple.patch
index 96432f70da..b6e529f3d3 100644
--- a/tools/depends/target/python3/apple.patch
+++ b/tools/depends/target/python3/apple.patch
@@ -28,7 +28,7 @@
    # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
    # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
    # or has another value. By not (re)defining it, the defaults come in place.
-@@ -2485,7 +2485,7 @@
+@@ -2492,7 +2492,7 @@
        	  return 1;
        }
      }
diff --git a/tools/depends/target/python3/crosscompile.patch b/tools/depends/target/python3/crosscompile.patch
index 7c27870fed..93c86b8047 100644
--- a/tools/depends/target/python3/crosscompile.patch
+++ b/tools/depends/target/python3/crosscompile.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1214,15 +1214,6 @@
+@@ -1221,15 +1221,6 @@
          ARFLAGS="rcs"
  fi
  
@@ -26,7 +26,7 @@
  SOABI=		@SOABI@
  LDVERSION=	@LDVERSION@
  LIBPYTHON=	@LIBPYTHON@
-@@ -635,7 +635,7 @@
+@@ -634,7 +634,7 @@
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
  	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -35,7 +35,7 @@
  
  
  # Build static library
-@@ -1695,10 +1595,11 @@
+@@ -1694,10 +1694,11 @@
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
  	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
@@ -70,12 +70,11 @@
  HOST_PLATFORM = get_platform()
  MS_WINDOWS = (HOST_PLATFORM == 'win32')
  CYGWIN = (HOST_PLATFORM == 'cygwin')
-@@ -442,6 +442,7 @@
+@@ -445,6 +445,7 @@
          self.compiler.set_executables(**args)
  
      def build_extensions(self):
 +        return
          self.set_srcdir()
- 
-         # Detect which modules should be compiled
- 
+         self.set_compiler_executables()
+         self.configure_compiler()
diff --git a/tools/depends/target/python3/darwin_embedded.patch b/tools/depends/target/python3/darwin_embedded.patch
index aeadf14dfb..92c4f2d043 100644
--- a/tools/depends/target/python3/darwin_embedded.patch
+++ b/tools/depends/target/python3/darwin_embedded.patch
@@ -10,7 +10,7 @@
          except OSError as e:
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
-@@ -614,7 +614,7 @@
+@@ -615,7 +615,7 @@
          default in case the command should fail.
  
      """