[3.10] Update Python to 3.10.22

AGENTS.md

@@ -0,0 +1,16 @@
+# Agent guidance
+
+## Updating Python and its patches
+
+Before preparing a Python version bump or editing `recipe/patches/*.patch`, read
+[the patch regeneration instructions](recipe/patches/README.md) and
+[`make-mixed-crlf-patch.py`](recipe/patches/make-mixed-crlf-patch.py) on the target
+version branch. If either is absent, consult the corresponding file on upstream
+`main`. The repository's patch instructions are authoritative.
+
+Follow the README's complete regeneration and validation workflow before
+committing or publishing patch changes. Keep that workflow in the README rather
+than duplicating it here.
+
+Run the applicable recipe and pre-commit checks, and report any checks that could
+not be completed.

recipe/fix_staged_scripts.py

@@ -10,6 +10,7 @@ def fix_staged_scripts(scripts_dir):
     Fixes scripts which have been installed unix-style to have a .bat
     helper
     """
+    target_arch = os.environ["target_platform"].split("-")[-1]
     if not isdir(scripts_dir):
         return
     for fn in os.listdir(scripts_dir):
@@ -31,7 +32,16 @@ def fix_staged_scripts(scripts_dir):
             # now create the .exe file
             # This is hardcoded that conda and conda-build are in the same environment
             base_env = dirname(dirname(os.environ['CONDA_EXE']))
-            exe = join(base_env, 'lib', 'site-packages', 'conda_build', 'cli-64.exe')
+            # conda-build >= 26.9 sources launchers from conda-launchers
+            candidates = [
+                join(base_env, 'share', 'conda-launchers', f'cli-{target_arch}.exe'),
+                join(base_env, 'lib', 'site-packages', 'conda_build', f'cli-{target_arch}.exe'),
+            ]
+            exe = next((path for path in candidates if isfile(path)), None)
+            if exe is None:
+                raise FileNotFoundError(
+                    'cli-64.exe launcher not found in any of: %s' % ', '.join(candidates)
+                )
             shutil.copyfile(exe, join(scripts_dir, fn + '.exe'))
 
         # remove the original script

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "3.10.21" %}
+{% set version = "3.10.22" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -47,7 +47,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
-    sha256: a0da1e72132e950154eca0f6f47d5db828454700de20e5113667940d81e0db04
+    sha256: c61fe9b1a1a7ec2a0b0388e664187c378a5325a89e3606d220abf5bdfccb2543
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,4 +1,4 @@
-From 664e2356fdbd34f87e4a2cb3f59c97dd1e6026e9 Mon Sep 17 00:00:00 2001
+From 3ca60242a2458a4b41a037109b07eed78cfb6916 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
 Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
@@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
-index 3afcb0e2a02..1ee953a6aea 100644
+index 3afcb0e2a0..1ee953a6ae 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
 @@ -33,7 +33,7 @@

recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch

@@ -1,4 +1,4 @@
-From 76e282d3720759bd681934774ea3d710e8c5fa69 Mon Sep 17 00:00:00 2001
+From 3dccfc4942ce9ecc6f140ce28c98b6d6c7cba89f Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:59:00 +0100
 Subject: [PATCH 02/26] Win32: distutils: Add support to cygwinccompiler for
@@ -10,7 +10,7 @@ Really this is for mingw-w64 though
  1 file changed, 3 insertions(+)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index 66c12dd3583..e6c790118bb 100644
+index 66c12dd358..e6c790118b 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
 @@ -80,6 +80,9 @@ def get_msvcr():

recipe/patches/0003-Support-cross-compiling-byte-code.patch

@@ -1,4 +1,4 @@
-From 6473bec059b0b98c2d96198ce87c2d453645c852 Mon Sep 17 00:00:00 2001
+From 972f7a6dabf1c6d21b24979ee13028480a9d16f1 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 12:17:33 +0100
 Subject: [PATCH 03/26] Support cross-compiling byte-code
@@ -11,7 +11,7 @@ https://bugs.python.org/issue22724
  3 files changed, 13 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index fa99dd86c41..eada53ed360 100644
+index fa99dd86c4..eada53ed36 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -261,6 +261,7 @@ BUILDPYTHON=	python$(BUILDEXE)
@@ -77,7 +77,7 @@ index fa99dd86c41..eada53ed360 100644
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
 diff --git a/configure b/configure
-index 4b71c4e00f8..03a361cbd90 100755
+index 4b71c4e00f..03a361cbd9 100755
 --- a/configure
 +++ b/configure
 @@ -760,6 +760,7 @@ CONFIG_ARGS
@@ -99,7 +99,7 @@ index 4b71c4e00f8..03a361cbd90 100755
  elif test "$cross_compiling" = maybe; then
      as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
 diff --git a/configure.ac b/configure.ac
-index ac3be3850a9..08d81c26c6e 100644
+index ac3be3850a..08d81c26c6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -82,13 +82,15 @@ if test "$cross_compiling" = yes; then

recipe/patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch

@@ -1,4 +1,4 @@
-From 957a0e6e879f4e43769c78dc76ffafb2cda862eb Mon Sep 17 00:00:00 2001
+From 65bbff7dd424c30936475df1a20423c293648e7e Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Tue, 21 Sep 2021 13:05:20 -0500
 Subject: [PATCH 04/26] bpo-45258: search for -isysroot in addition to
@@ -10,7 +10,7 @@ Subject: [PATCH 04/26] bpo-45258: search for -isysroot in addition to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index a39610a1c7c..b2d68de7cd1 100644
+index a39610a1c7..b2d68de7cd 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -163,7 +163,7 @@ def sysroot_paths(make_vars, subdirs):

recipe/patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch

@@ -1,4 +1,4 @@
-From 42fe97e6cbb184cda0e2c96b63e227627828ddf8 Mon Sep 17 00:00:00 2001
+From 44a9f79d1721b83e3f78d22ed76459eeb4104fb1 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 5 Oct 2017 02:00:41 +0100
 Subject: [PATCH 05/26] runtime_library_dir_option: Use 1st word of CC as
@@ -12,7 +12,7 @@ not get detected as gcc (or whatever it actually is).
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
-index d00c48981eb..54dd556fe5a 100644
+index d00c48981e..54dd556fe5 100644
 --- a/Lib/distutils/unixccompiler.py
 +++ b/Lib/distutils/unixccompiler.py
 @@ -232,7 +232,8 @@ def runtime_library_dir_option(self, dir):

recipe/patches/0006-Win32-Do-not-download-externals.patch

@@ -1,4 +1,4 @@
-From 4892411b32b8b4e46fc00e75504daf3e25ecd610 Mon Sep 17 00:00:00 2001
+From 7eb36d70e1b5743364a368bca5eb7640ab0abb2e Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
 Subject: [PATCH 06/26] Win32: Do not download externals
@@ -8,7 +8,7 @@ Subject: [PATCH 06/26] Win32: Do not download externals
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/PCbuild/build.bat b/PCbuild/build.bat
-index d333ceabd2e..11e3d16a4fd 100644
+index d333ceabd2..11e3d16a4f 100644
 --- a/PCbuild/build.bat
 +++ b/PCbuild/build.bat
 @@ -97,7 +97,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true

recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch

@@ -1,4 +1,4 @@
-From d69ba7d9a48299238f7c564f99234e56ea74dcca Mon Sep 17 00:00:00 2001
+From b7074cbd937048c13fde9bbe50b37c54a598673b Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
 Subject: [PATCH 07/26] Fix find_library so that it looks in sys.prefix/lib
@@ -10,7 +10,7 @@ Subject: [PATCH 07/26] Fix find_library so that it looks in sys.prefix/lib
  2 files changed, 28 insertions(+), 3 deletions(-)
 
 diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py
-index 1c3f8fd38b0..82a4b4fd58a 100644
+index 1c3f8fd38b..82a4b4fd58 100644
 --- a/Lib/ctypes/macholib/dyld.py
 +++ b/Lib/ctypes/macholib/dyld.py
 @@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None):
@@ -25,7 +25,7 @@ index 1c3f8fd38b0..82a4b4fd58a 100644
          yield os.path.join(executable_path, name[len('@executable_path/'):])
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 0c2510e1619..4548cd27a8c 100644
+index 0c2510e161..4548cd27a8 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
 @@ -70,7 +70,8 @@ def find_library(name):

recipe/patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch

@@ -1,4 +1,4 @@
-From 2936ce4d00b332f2539524c00571bff9cfac5f02 Mon Sep 17 00:00:00 2001
+From 406d24dd79ccf9710716826b292626f3b4703c41 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Thu, 16 Sep 2021 15:46:09 -0500
 Subject: [PATCH 08/26] bpo-22699: Allow compiling on debian/ubuntu with a
@@ -12,7 +12,7 @@ patch than given
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index b2d68de7cd1..ddaa6d743cd 100644
+index b2d68de7cd..ddaa6d743c 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -666,9 +666,30 @@ def check_extension_import(self, ext):

recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch

@@ -1,4 +1,4 @@
-From 250524b831eaf0684399911a5285a8cb582109a1 Mon Sep 17 00:00:00 2001
+From 9fb9d77d84876ba0bdf348e964089f27042cf1ac Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
 Subject: [PATCH 09/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
@@ -9,7 +9,7 @@ Subject: [PATCH 09/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/PC/getpathp.c b/PC/getpathp.c
-index 7c0eeab5dba..a73ea8a0e91 100644
+index 7c0eeab5db..a73ea8a0e9 100644
 --- a/PC/getpathp.c
 +++ b/PC/getpathp.c
 @@ -778,13 +778,18 @@ calculate_module_search_path(PyCalculatePath *calculate,

recipe/patches/0010-Unvendor-openssl.patch

@@ -1,4 +1,4 @@
-From f5bad88adbed923fe017d01691cdec1ce1c8e562 Mon Sep 17 00:00:00 2001
+From 08b69d17cd366f4437aee8818892475b1b1daa75 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 24 Nov 2018 20:38:02 -0600
 Subject: [PATCH 10/26] Unvendor openssl
@@ -15,7 +15,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  7 files changed, 9 insertions(+), 70 deletions(-)
 
 diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
-index 4907f49b662..b2c23d5e8cc 100644
+index 4907f49b66..b2c23d5e8c 100644
 --- a/PCbuild/_ssl.vcxproj
 +++ b/PCbuild/_ssl.vcxproj
 @@ -99,9 +99,6 @@
@@ -29,7 +29,7 @@ index 4907f49b662..b2c23d5e8cc 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc" />
 diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters
-index 716a69a41af..8aef9e03fcc 100644
+index 716a69a41a..8aef9e03fc 100644
 --- a/PCbuild/_ssl.vcxproj.filters
 +++ b/PCbuild/_ssl.vcxproj.filters
 @@ -12,9 +12,6 @@
@@ -43,7 +43,7 @@ index 716a69a41af..8aef9e03fcc 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
 diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
-index a7e16793c7f..f7e9be4d110 100644
+index a7e16793c7..f7e9be4d11 100644
 --- a/PCbuild/openssl.props
 +++ b/PCbuild/openssl.props
 @@ -2,10 +2,10 @@
@@ -72,7 +72,7 @@ index a7e16793c7f..f7e9be4d110 100644
  </Project>
 \ No newline at end of file
 diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
-index 0da6f674958..17eee400ebb 100644
+index 0da6f67495..17eee400eb 100644
 --- a/PCbuild/openssl.vcxproj
 +++ b/PCbuild/openssl.vcxproj
 @@ -60,64 +60,8 @@
@@ -141,7 +141,7 @@ index 0da6f674958..17eee400ebb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index 057ed5ac224..b7f958193cb 100644
+index 057ed5ac22..b7f958193c 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -57,6 +57,7 @@
@@ -153,7 +153,7 @@ index 057ed5ac224..b7f958193cb 100644
      <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
    </PropertyGroup>
 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
-index 0adce0958b1..38bab083060 100644
+index 0adce0958b..38bab08306 100644
 --- a/PCbuild/python.vcxproj
 +++ b/PCbuild/python.vcxproj
 @@ -106,6 +106,9 @@
@@ -167,7 +167,7 @@ index 0adce0958b1..38bab083060 100644
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
-index e23635e5ea9..525295c76ff 100644
+index e23635e5ea..525295c76f 100644
 --- a/PCbuild/pythonw.vcxproj
 +++ b/PCbuild/pythonw.vcxproj
 @@ -98,6 +98,9 @@

recipe/patches/0011-Unvendor-sqlite3.patch

@@ -1,4 +1,4 @@
-From 13fddbf07b7cdf832b90e4a2ab56cbaaf38703f2 Mon Sep 17 00:00:00 2001
+From b65f4da7b545fa047ed1ff32b1fd73b3c505049c Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
 Subject: [PATCH 11/26] Unvendor sqlite3
@@ -11,7 +11,7 @@ Subject: [PATCH 11/26] Unvendor sqlite3
  4 files changed, 11 insertions(+), 14 deletions(-)
 
 diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
-index 5eb8559d292..fcdee1be600 100644
+index 5eb8559d29..fcdee1be60 100644
 --- a/PCbuild/_sqlite3.vcxproj
 +++ b/PCbuild/_sqlite3.vcxproj
 @@ -93,8 +93,11 @@
@@ -39,7 +39,7 @@ index 5eb8559d292..fcdee1be600 100644
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
-index 3507b972797..2b4ac3258c0 100644
+index 3507b97279..2b4ac3258c 100644
 --- a/PCbuild/pcbuild.sln
 +++ b/PCbuild/pcbuild.sln
 @@ -55,8 +55,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj"
@@ -52,7 +52,7 @@ index 3507b972797..2b4ac3258c0 100644
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index b7f958193cb..fe3fd7bad2a 100644
+index b7f958193c..fe3fd7bad2 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -65,7 +65,7 @@
@@ -65,7 +65,7 @@ index b7f958193cb..fe3fd7bad2a 100644
      <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
      <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
 diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
-index e39e2d9c226..63d1c27fbc7 100644
+index e39e2d9c22..63d1c27fbc 100644
 --- a/PCbuild/sqlite3.vcxproj
 +++ b/PCbuild/sqlite3.vcxproj
 @@ -88,12 +88,12 @@

recipe/patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch

@@ -1,4 +1,4 @@
-From d7816251bb78db7b8ac45f9081bf41be9e7b02dd Mon Sep 17 00:00:00 2001
+From c70ec9760f0dbb81efe28dfc1295e41f8149b28b Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 3 Nov 2019 15:09:45 -0600
 Subject: [PATCH 12/26] Use ranlib from env if env variable is set
@@ -8,7 +8,7 @@ Subject: [PATCH 12/26] Use ranlib from env if env variable is set
  1 file changed, 3 insertions(+)
 
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 3414a761e76..181f66708e9 100644
+index 3414a761e7..181f66708e 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
 @@ -263,6 +263,9 @@ def customize_compiler(compiler):

recipe/patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch

@@ -1,4 +1,4 @@
-From dcdf1dee198f8fc7a63828ec179bcd23096a0211 Mon Sep 17 00:00:00 2001
+From efe10f11947f43d55b8d7a3f34315585e47cd3d7 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
 Subject: [PATCH 13/26] Add CondaEcosystemModifyDllSearchPath()
@@ -61,7 +61,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  3 files changed, 378 insertions(+), 1 deletion(-)
 
 diff --git a/Modules/main.c b/Modules/main.c
-index 48d9247c132..697a13cc751 100644
+index 48d9247c13..697a13cc75 100644
 --- a/Modules/main.c
 +++ b/Modules/main.c
 @@ -17,6 +17,10 @@
@@ -453,7 +453,7 @@ index 48d9247c132..697a13cc751 100644
      if (_PyStatus_IS_EXIT(status)) {
          pymain_free();
 diff --git a/Python/dynload_win.c b/Python/dynload_win.c
-index 96faa4b4629..06dedc4af67 100644
+index 96faa4b462..06dedc4af6 100644
 --- a/Python/dynload_win.c
 +++ b/Python/dynload_win.c
 @@ -191,6 +191,10 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix,
@@ -468,7 +468,7 @@ index 96faa4b4629..06dedc4af67 100644
          hDLL = LoadLibraryExW(wpathname, NULL,
                                LOAD_LIBRARY_SEARCH_DEFAULT_DIRS |
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index b0c5da56c4f..41948479574 100644
+index b0c5da56c4..4194847957 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -101,7 +101,10 @@ _PyRuntime_Initialize(void)

recipe/patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch

@@ -1,4 +1,4 @@
-From 422fe2754b69fd46b815cf97e6040c690d43f13a Mon Sep 17 00:00:00 2001
+From 4fcbf4d2ad273439ca4dc3d9eeb7b442af315ba4 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 20:46:36 +0100
 Subject: [PATCH 14/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
@@ -8,7 +8,7 @@ Subject: [PATCH 14/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
-index af8099a4078..0b245adb309 100644
+index af8099a407..0b245adb30 100644
 --- a/Lib/distutils/_msvccompiler.py
 +++ b/Lib/distutils/_msvccompiler.py
 @@ -346,6 +346,13 @@ def compile(self, sources,