From ebc2f4916788d669c3f8376be2ea2879ac4329f7 Mon Sep 17 00:00:00 2001
From: fuzzard <fuzzard@kodi.tv>
Date: Wed, 18 May 2022 08:57:18 +1000
Subject: [tools/depends] python 3.9.13

---
 .../depends/native/python3/01-distutil-flags.patch |  2 +-
 tools/depends/native/python3/PYTHON3-VERSION       |  5 +++--
 tools/depends/native/python3/distutil.patch        | 12 ----------
 tools/depends/target/python3/Makefile              |  1 -
 tools/depends/target/python3/PYTHON3-VERSION       |  5 +++--
 tools/depends/target/python3/crosscompile.patch    | 26 ----------------------
 6 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 tools/depends/native/python3/distutil.patch

diff --git a/tools/depends/native/python3/01-distutil-flags.patch b/tools/depends/native/python3/01-distutil-flags.patch
index fe83ebe333..8ab20bf6db 100644
--- a/tools/depends/native/python3/01-distutil-flags.patch
+++ b/tools/depends/native/python3/01-distutil-flags.patch
@@ -1,6 +1,6 @@
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
-@@ -190,6 +190,9 @@
+@@ -196,6 +196,9 @@
          (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
              get_config_vars('CC', 'CXX', 'CFLAGS',
                              'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
diff --git a/tools/depends/native/python3/PYTHON3-VERSION b/tools/depends/native/python3/PYTHON3-VERSION
index c68c3d6c9b..904a958141 100644
--- a/tools/depends/native/python3/PYTHON3-VERSION
+++ b/tools/depends/native/python3/PYTHON3-VERSION
@@ -1,5 +1,6 @@
 LIBNAME=Python
-VERSION=3.9.10
+VERSION=3.9.13
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
-SHA512=09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba
+SHA512=e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
+
diff --git a/tools/depends/native/python3/distutil.patch b/tools/depends/native/python3/distutil.patch
deleted file mode 100644
index fe83ebe333..0000000000
--- a/tools/depends/native/python3/distutil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -190,6 +190,9 @@
-         (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
-             get_config_vars('CC', 'CXX', 'CFLAGS',
-                             'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        # get_config_vars returns host vars. clear cflags, ldshared for crosscompile use
-+        cflags = ""
-+        ldshared = cc + " -shared"
-
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
diff --git a/tools/depends/target/python3/Makefile b/tools/depends/target/python3/Makefile
index f68a56d08c..089dffbddf 100644
--- a/tools/depends/target/python3/Makefile
+++ b/tools/depends/target/python3/Makefile
@@ -29,7 +29,6 @@ CONFIGURE=./configure --prefix=$(PREFIX) \
                       --enable-ipv6 \
                       $(EXTRA_CONFIGURE)
 
-
 LIBDYLIB=$(PLATFORM)/libpython$(PYTHON_VERSION).a
 
 all: .installed-$(PLATFORM)
diff --git a/tools/depends/target/python3/PYTHON3-VERSION b/tools/depends/target/python3/PYTHON3-VERSION
index c68c3d6c9b..904a958141 100644
--- a/tools/depends/target/python3/PYTHON3-VERSION
+++ b/tools/depends/target/python3/PYTHON3-VERSION
@@ -1,5 +1,6 @@
 LIBNAME=Python
-VERSION=3.9.10
+VERSION=3.9.13
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
-SHA512=09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba
+SHA512=e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
+
diff --git a/tools/depends/target/python3/crosscompile.patch b/tools/depends/target/python3/crosscompile.patch
index 93c86b8047..1b7b47725a 100644
--- a/tools/depends/target/python3/crosscompile.patch
+++ b/tools/depends/target/python3/crosscompile.patch
@@ -18,23 +18,6 @@
  case $MACHDEP in
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -38,7 +38,6 @@
- MAINCC=		@MAINCC@
- LINKCC=		@LINKCC@
- AR=		@AR@
--READELF=	@READELF@
- SOABI=		@SOABI@
- LDVERSION=	@LDVERSION@
- LIBPYTHON=	@LIBPYTHON@
-@@ -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)' \
--		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-+		PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
- 
- # Build static library
 @@ -1694,10 +1694,11 @@
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -61,15 +44,6 @@
  
  # This global variable is used to hold the list of modules to be disabled.
  DISABLED_MODULE_LIST = []
-@@ -58,7 +58,7 @@
-     return sys.platform
- 
- 
--CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ)
-+CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('CROSS_COMPILE_TARGET' in os.environ)
- HOST_PLATFORM = get_platform()
- MS_WINDOWS = (HOST_PLATFORM == 'win32')
- CYGWIN = (HOST_PLATFORM == 'cygwin')
 @@ -445,6 +445,7 @@
          self.compiler.set_executables(**args)
  
-- 
cgit v1.2.3