From 0bcde10bff5763027036efd2b6b07922f7c50a9e Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 5 Oct 2021 06:19:40 +0300
Subject: [PATCH] python: 3.10.0

---
 extra/python/checksums                        |  5 +-
 extra/python/patches/python3-always-pip.patch |  6 +--
 extra/python/patches/python3-no-static.patch  | 52 -------------------
 extra/python/sources                          |  1 -
 extra/python/version                          |  2 +-
 5 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 extra/python/patches/python3-no-static.patch

diff --git a/extra/python/checksums b/extra/python/checksums
index 0f64267d..77cdedff 100644
--- a/extra/python/checksums
+++ b/extra/python/checksums
@@ -1,4 +1,3 @@
-f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57
-1e3dd58370fa3f5c9454f72479565e5282d16defdeec43c88e9a4dd233e00c1b
-18ec738f531ff250c96b74f80bdba58433a39302ab69895593cc2fa2bdf4d0aa
+5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
+839bb1420041ea5fd68d3fe158bc234fc5bab6d8978ac12d9874366e697a6fcc
 e39e9562cf5b864500ef358960545787761fc4271829d22b19c893d1ce0e4546
diff --git a/extra/python/patches/python3-always-pip.patch b/extra/python/patches/python3-always-pip.patch
index a228bd6b..f626ff5d 100644
--- a/extra/python/patches/python3-always-pip.patch
+++ b/extra/python/patches/python3-always-pip.patch
@@ -1,9 +1,9 @@
 diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index f3152a5..52f6312 100644
+index f28ab11..6627189 100644
 --- a/Lib/ensurepip/__init__.py
 +++ b/Lib/ensurepip/__init__.py
-@@ -116,7 +116,7 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
-             additional_paths.append(os.path.join(tmpdir, wheel_name))
+@@ -180,7 +180,7 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+             additional_paths.append(filename)
  
          # Construct the arguments to be passed to the pip command
 -        args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
diff --git a/extra/python/patches/python3-no-static.patch b/extra/python/patches/python3-no-static.patch
deleted file mode 100644
index da9bf92d..00000000
--- a/extra/python/patches/python3-no-static.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2b68571..41871c9 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -589,7 +589,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
- 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
- 
- # Build the interpreter
--$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
-+$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
- 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
- 
- platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -638,11 +638,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
- 
--# Build static library
--$(LIBRARY): $(LIBRARY_OBJS)
--	-rm -f $@
--	$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
--
- libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
- 	if test $(INSTSONAME) != $(LDLIBRARY); then \
- 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -724,7 +719,7 @@ Makefile Modules/config.c: Makefile.pre \
- 	@echo "The Makefile was updated, you may need to re-run make."
- 
- 
--Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
-+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
- 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
- 
- ############################################################################
-@@ -1652,17 +1647,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
- 		else	true; \
- 		fi; \
- 	done
--	@if test -d $(LIBRARY); then :; else \
--		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
--			if test "$(SHLIB_SUFFIX)" = .dll; then \
--				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
--			else \
--				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--			fi; \
--		else \
--			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--		fi; \
--	fi
- 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- 	$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
- 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
diff --git a/extra/python/sources b/extra/python/sources
index 8952dfbc..fd1c714b 100644
--- a/extra/python/sources
+++ b/extra/python/sources
@@ -1,4 +1,3 @@
 https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz
 patches/python3-always-pip.patch
-patches/python3-no-static.patch
 patches/python3-pyc-hash.patch
diff --git a/extra/python/version b/extra/python/version
index c55f4597..7951492a 100644
--- a/extra/python/version
+++ b/extra/python/version
@@ -1 +1 @@
-3.9.7 1
+3.10.0 1