From d3a01900f9772167a0a6991ea95b8c8a01e01cc7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 10 Sep 2024 08:31:11 +0200 Subject: [PATCH 1/4] python v3.12.6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 64186732..1d43f306 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.12.5" %} +{% set version = "3.12.6" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} @@ -46,7 +46,7 @@ source: {% else %} - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - md5: 02c7d269e077f4034963bba6befdc715 + md5: cb669514937d3e894e74081627722aa5 {% endif %} patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch From c97f7e71f872416df49ef8fd8b7b08fe5e449ef5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 10 Sep 2024 08:32:19 +0200 Subject: [PATCH 2/4] rebase patches --- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 4 +- ...0002-Win32-Do-not-download-externals.patch | 4 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 6 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 6 +- recipe/patches/0005-Unvendor-openssl.patch | 20 ++--- recipe/patches/0006-Unvendor-sqlite3.patch | 8 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 4 +- recipe/patches/0008-Doing-d1trimfile.patch | 86 +++++++++---------- .../patches/0009-cross-compile-darwin.patch | 8 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 4 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 4 +- recipe/patches/0012-Unvendor-bzip2.patch | 6 +- recipe/patches/0013-Unvendor-libffi.patch | 4 +- recipe/patches/0014-Unvendor-tcltk.patch | 6 +- recipe/patches/0015-unvendor-xz.patch | 4 +- recipe/patches/0016-unvendor-zlib.patch | 6 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 6 +- recipe/patches/0018-Unvendor-expat.patch | 10 +-- .../patches/0019-Remove-unused-readelf.patch | 4 +- ...t-checksharedmods-if-cross-compiling.patch | 12 +-- .../0021-Override-configure-LIBFFI.patch | 4 +- ...cursesw-panelw-on-macOS-if-available.patch | 6 +- 22 files changed, 111 insertions(+), 111 deletions(-) diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index b0aefe51..640929d1 100644 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,4 +1,4 @@ -From 4f915b76bf52d9a4a355e0047b0ac8d66a8ec336 Mon Sep 17 00:00:00 2001 +From edbd7f42ff90622685f5fa15b8c639ed3f7832a6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/22] 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 97f1db20f6..166222bafb 100644 +index 50788e5344c..43df5ecba84 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -46,7 +46,7 @@ diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index e9ca11c7..beea6759 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,4 +1,4 @@ -From 89ac50838fc3c43b63342d7b9c434fe68e11d678 Mon Sep 17 00:00:00 2001 +From 1865372dfa940600b533c0be8fd8e384465c1cd9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/22] Win32: Do not download externals @@ -8,7 +8,7 @@ Subject: [PATCH 02/22] Win32: Do not download externals 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index d333ceabd2..11e3d16a4f 100644 +index d333ceabd2e..11e3d16a4fd 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -97,7 +97,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 89ad52da..3d6fcc44 100644 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,4 +1,4 @@ -From 1add97729db66a572b0ad8f26186071c6d1b19fd Mon Sep 17 00:00:00 2001 +From 1c661b34b7aa6a685b8e196a071c234dfd3d3ae1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/22] Fix find_library so that it looks in sys.prefix/lib @@ -10,7 +10,7 @@ Subject: [PATCH 03/22] 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 583c47daff..ab9b01c87e 100644 +index 583c47daff3..ab9b01c87e2 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 583c47daff..ab9b01c87e 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index c550883e7c..78b0b014f0 100644 +index c550883e7c7..78b0b014f09 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ def find_library(name): diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index 98b125fa..d97ad28a 100644 --- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,4 +1,4 @@ -From 4c0b20c3cebfcb8eaa0406c7b626322d01087492 Mon Sep 17 00:00:00 2001 +From a71272380012ea0c78c9979ffcac49c121e30974 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/22] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS @@ -11,7 +11,7 @@ Co-authored-by: Isuru Fernando 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/getpath.c b/Modules/getpath.c -index 0a31000075..b0efef2f53 100644 +index 0a310000751..b0efef2f539 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -899,6 +899,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) @@ -23,7 +23,7 @@ index 0a31000075..b0efef2f53 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index 9913fcba49..15a06c7e44 100644 +index 9913fcba497..15a06c7e44b 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -51,6 +51,7 @@ diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 11c73027..9e618176 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 91c6890e658e06e72213b8699e9c7e15ab42de55 Mon Sep 17 00:00:00 2001 +From b1482bc2c57ab9e23382c0670377a88f68850048 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/22] Unvendor openssl @@ -15,7 +15,7 @@ Co-authored-by: Isuru Fernando 7 files changed, 9 insertions(+), 84 deletions(-) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index 226ff506f8..e2fac911e1 100644 +index 226ff506f8c..e2fac911e1e 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -99,9 +99,6 @@ @@ -29,7 +29,7 @@ index 226ff506f8..e2fac911e1 100644 diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters -index 716a69a41a..8aef9e03fc 100644 +index 716a69a41af..8aef9e03fcc 100644 --- a/PCbuild/_ssl.vcxproj.filters +++ b/PCbuild/_ssl.vcxproj.filters @@ -12,9 +12,6 @@ @@ -43,7 +43,7 @@ index 716a69a41a..8aef9e03fc 100644 diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 5fd708b211..044cefd95e 100644 +index 5fd708b211e..044cefd95ea 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -2,10 +2,10 @@ @@ -75,7 +75,7 @@ index 5fd708b211..044cefd95e 100644 - diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 0da6f67495..17eee400eb 100644 +index 0da6f674958..17eee400ebb 100644 --- a/PCbuild/openssl.vcxproj +++ b/PCbuild/openssl.vcxproj @@ -60,64 +60,8 @@ @@ -144,7 +144,7 @@ index 0da6f67495..17eee400eb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index d799948fa3..cf0913f331 100644 +index b893960f996..cf0913f3310 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -61,6 +61,7 @@ @@ -165,8 +165,8 @@ index d799948fa3..cf0913f331 100644 - $(ExternalsDir)libffi-3.4.4\ - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include -- $(ExternalsDir)openssl-3.0.13\ -- $(ExternalsDir)openssl-bin-3.0.13\$(ArchName)\ +- $(ExternalsDir)openssl-3.0.15\ +- $(ExternalsDir)openssl-bin-3.0.15\$(ArchName)\ - $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ - $(ExternalsDir)\zlib-1.3.1\ @@ -174,7 +174,7 @@ index d799948fa3..cf0913f331 100644 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 846c87fd1a..8021002c16 100644 +index 846c87fd1ac..8021002c165 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -107,6 +107,9 @@ @@ -188,7 +188,7 @@ index 846c87fd1a..8021002c16 100644 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index f485352f64..38a2547089 100644 +index f485352f642..38a25470895 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -99,6 +99,9 @@ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 13ca0de7..753bb56d 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 0a0c280aec453af0a3904a696dfc71175e6dc246 Mon Sep 17 00:00:00 2001 +From 4e8f641971837d0e541d6512c2d4392ea5ac44da Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/22] Unvendor sqlite3 @@ -10,7 +10,7 @@ Subject: [PATCH 06/22] Unvendor sqlite3 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 57c7413671..4735477f00 100644 +index 57c7413671e..4735477f00c 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -93,9 +93,12 @@ @@ -43,7 +43,7 @@ index 57c7413671..4735477f00 100644 \ No newline at end of file + diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index bdddec60da..ab43b610a9 100644 +index bdddec60daa..ab43b610a97 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -99,8 +99,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj" @@ -56,7 +56,7 @@ index bdddec60da..ab43b610a9 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index c502d51833..c1ff0c9a08 100644 +index c502d51833b..c1ff0c9a084 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -88,12 +88,12 @@ diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index 2df35886..6464dc3e 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 46d9b400457bec18d25f3977758daa76d53acbf4 Mon Sep 17 00:00:00 2001 +From 53c1acbbb53224e6c6a3eff7e1765139a8419792 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/22] Add CondaEcosystemModifyDllSearchPath() @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando 1 file changed, 96 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 2c36527a87..84cbae8248 100644 +index 2c36527a875..84cbae82486 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -51,6 +51,10 @@ diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 8b012444..a7dab97a 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 679e1d26a2d1883952ef98d191cc08242adcab12 Mon Sep 17 00:00:00 2001 +From f264dd3ca56877b0debf68cddf88e9bc58adfa5f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/22] Doing d1trimfile @@ -49,7 +49,7 @@ Subject: [PATCH 08/22] Doing d1trimfile 42 files changed, 364 insertions(+), 4 deletions(-) diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj -index ed1e1bc0a4..47d322be5f 100644 +index ed1e1bc0a42..47d322be5fd 100644 --- a/PCbuild/_asyncio.vcxproj +++ b/PCbuild/_asyncio.vcxproj @@ -91,6 +91,26 @@ @@ -80,7 +80,7 @@ index ed1e1bc0a4..47d322be5f 100644 diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 3fe95fbf83..0402f7a9aa 100644 +index 3fe95fbf839..0402f7a9aaa 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -97,6 +97,10 @@ @@ -95,7 +95,7 @@ index 3fe95fbf83..0402f7a9aa 100644 diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj -index 253da31e9c..9e85bd9723 100644 +index 253da31e9ce..9e85bd9723b 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -95,6 +95,10 @@ @@ -110,7 +110,7 @@ index 253da31e9c..9e85bd9723 100644 /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj -index 8a01e743a4..1ad658d5f9 100644 +index 8a01e743a4d..1ad658d5f91 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -92,6 +92,26 @@ @@ -141,7 +141,7 @@ index 8a01e743a4..1ad658d5f9 100644 diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index 0916f1a2d3..17a4cbfcd7 100644 +index 0916f1a2d37..17a4cbfcd7c 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -99,6 +99,10 @@ @@ -156,7 +156,7 @@ index 0916f1a2d3..17a4cbfcd7 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 8da5244bac..20cc09d63f 100644 +index 8da5244bac0..20cc09d63ff 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -173,7 +173,7 @@ index 8da5244bac..20cc09d63f 100644 diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj -index 3df0a07204..26982e0ceb 100644 +index 3df0a072045..26982e0ceb8 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -91,6 +91,10 @@ @@ -188,7 +188,7 @@ index 3df0a07204..26982e0ceb 100644 Console diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj -index 6dad8183c5..6d3d37fdf9 100644 +index 6dad8183c57..6d3d37fdf95 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -96,6 +96,18 @@ @@ -211,7 +211,7 @@ index 6dad8183c5..6d3d37fdf9 100644 diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index fe076a6fc5..0565132363 100644 +index fe076a6fc57..0565132363e 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -95,6 +95,10 @@ @@ -226,7 +226,7 @@ index fe076a6fc5..0565132363 100644 $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj -index 720eb2931b..247ab0e915 100644 +index 720eb2931be..247ab0e9155 100644 --- a/PCbuild/_msi.vcxproj +++ b/PCbuild/_msi.vcxproj @@ -96,6 +96,18 @@ @@ -249,7 +249,7 @@ index 720eb2931b..247ab0e915 100644 diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj -index 77b6bfc8e1..3c2b651549 100644 +index 77b6bfc8e1e..3c2b6515496 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -95,6 +95,18 @@ @@ -272,7 +272,7 @@ index 77b6bfc8e1..3c2b651549 100644 diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj -index 9e60d3b5db..95b57290f8 100644 +index 9e60d3b5db3..95b57290f83 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -95,6 +95,18 @@ @@ -295,7 +295,7 @@ index 9e60d3b5db..95b57290f8 100644 diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj -index 8065b23585..e46ab5a83b 100644 +index 8065b235851..e46ab5a83b2 100644 --- a/PCbuild/_queue.vcxproj +++ b/PCbuild/_queue.vcxproj @@ -91,6 +91,26 @@ @@ -326,7 +326,7 @@ index 8065b23585..e46ab5a83b 100644 diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj -index 78fa4d6729..be19cf1dca 100644 +index 78fa4d6729a..be19cf1dca2 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -95,6 +95,18 @@ @@ -349,7 +349,7 @@ index 78fa4d6729..be19cf1dca 100644 diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 4735477f00..c7c377e217 100644 +index 4735477f00c..c7c377e2179 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -95,6 +95,10 @@ @@ -364,7 +364,7 @@ index 4735477f00..c7c377e217 100644 $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index e2fac911e1..5c1ae2fce2 100644 +index e2fac911e1e..5c1ae2fce27 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -387,7 +387,7 @@ index e2fac911e1..5c1ae2fce2 100644 diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj -index 917d7ae50f..8c7e141eea 100644 +index 917d7ae50fe..8c7e141eeaa 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -92,6 +92,26 @@ @@ -418,7 +418,7 @@ index 917d7ae50f..8c7e141eea 100644 diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 257562c75d..41bd3cc56c 100644 +index 257562c75d1..41bd3cc56cf 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ @@ -449,7 +449,7 @@ index 257562c75d..41bd3cc56c 100644 diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj -index 5d7e14eff1..695dcb3b91 100644 +index 5d7e14eff10..695dcb3b917 100644 --- a/PCbuild/_testconsole.vcxproj +++ b/PCbuild/_testconsole.vcxproj @@ -92,6 +92,10 @@ @@ -464,7 +464,7 @@ index 5d7e14eff1..695dcb3b91 100644 Console diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj -index a7ea8787e0..eab72171e3 100644 +index a7ea8787e0c..eab72171e3b 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -89,6 +89,10 @@ @@ -479,7 +479,7 @@ index a7ea8787e0..eab72171e3 100644 Console diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj -index 6d80d5779f..951bf40e7c 100644 +index 6d80d5779f2..951bf40e7cd 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -92,6 +92,26 @@ @@ -510,7 +510,7 @@ index 6d80d5779f..951bf40e7c 100644 diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj -index 6c5b12cd40..d25c774913 100644 +index 6c5b12cd40e..d25c7749138 100644 --- a/PCbuild/_testinternalcapi.vcxproj +++ b/PCbuild/_testinternalcapi.vcxproj @@ -92,6 +92,26 @@ @@ -541,7 +541,7 @@ index 6c5b12cd40..d25c774913 100644 diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj -index 430eb528cc..7a268d227b 100644 +index 430eb528cc3..7a268d227bc 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -92,6 +92,10 @@ @@ -556,7 +556,7 @@ index 430eb528cc..7a268d227b 100644 Console diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 30cedcbb43..0484a5c81f 100644 +index 30cedcbb43d..0484a5c81f6 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -96,6 +96,10 @@ @@ -571,7 +571,7 @@ index 30cedcbb43..0484a5c81f 100644 $(tcltkLib);%(AdditionalDependencies) diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj -index 4dd42ab98a..7c2dbc7e70 100644 +index 4dd42ab98a9..7c2dbc7e701 100644 --- a/PCbuild/liblzma.vcxproj +++ b/PCbuild/liblzma.vcxproj @@ -94,6 +94,10 @@ @@ -586,7 +586,7 @@ index 4dd42ab98a..7c2dbc7e70 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 001f8afd89..3be4ac06dd 100644 +index 001f8afd89b..3be4ac06dd8 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -601,7 +601,7 @@ index 001f8afd89..3be4ac06dd 100644 diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj -index 35f2f7e505..02d7961c5d 100644 +index 35f2f7e505b..02d7961c5d8 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -93,6 +93,10 @@ @@ -616,7 +616,7 @@ index 35f2f7e505..02d7961c5d 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj -index ea432d6bc9..13bc692103 100644 +index ea432d6bc9a..13bc6921030 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -92,6 +92,10 @@ @@ -631,7 +631,7 @@ index ea432d6bc9..13bc692103 100644 version.lib;shlwapi.lib;%(AdditionalDependencies) diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 8021002c16..9eb3f36940 100644 +index 8021002c165..9eb3f369406 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -91,6 +91,10 @@ @@ -646,7 +646,7 @@ index 8021002c16..9eb3f36940 100644 Console diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj -index ec22e6fc76..80dff0a3d9 100644 +index ec22e6fc76e..80dff0a3d97 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -93,6 +93,10 @@ @@ -661,7 +661,7 @@ index ec22e6fc76..80dff0a3d9 100644 true diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj -index fb27e9e712..f8dc841ef1 100644 +index fb27e9e7122..f8dc841ef1b 100644 --- a/PCbuild/python_uwp.vcxproj +++ b/PCbuild/python_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -674,7 +674,7 @@ index fb27e9e712..f8dc841ef1 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index b265264dc1..9390c4d7d7 100644 +index b265264dc16..9390c4d7d76 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ @@ -687,7 +687,7 @@ index b265264dc1..9390c4d7d7 100644 $(zlibDir);%(AdditionalIncludeDirectories) _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 38a2547089..0b05df346e 100644 +index 38a25470895..0b05df346e9 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -93,6 +93,18 @@ @@ -710,7 +710,7 @@ index 38a2547089..0b05df346e 100644 diff --git a/PCbuild/pythonw_uwp.vcxproj b/PCbuild/pythonw_uwp.vcxproj -index e21e46a1b7..ff7dc6635d 100644 +index e21e46a1b72..ff7dc6635df 100644 --- a/PCbuild/pythonw_uwp.vcxproj +++ b/PCbuild/pythonw_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -723,7 +723,7 @@ index e21e46a1b7..ff7dc6635d 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj -index e50b69aefe..3aa738bb7f 100644 +index e50b69aefe2..3aa738bb7f3 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -738,7 +738,7 @@ index e50b69aefe..3aa738bb7f 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj -index 750a713949..1da66eaddc 100644 +index 750a7139499..1da66eaddcb 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -94,6 +94,18 @@ @@ -761,7 +761,7 @@ index 750a713949..1da66eaddc 100644 diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj -index addef75335..1a13f363e2 100644 +index addef753359..1a13f363e26 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -91,6 +91,26 @@ @@ -792,7 +792,7 @@ index addef75335..1a13f363e2 100644 diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj -index 123e84ec4e..6272f9f69d 100644 +index 123e84ec4e3..6272f9f69db 100644 --- a/PCbuild/venvlauncher.vcxproj +++ b/PCbuild/venvlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -807,7 +807,7 @@ index 123e84ec4e..6272f9f69d 100644 PY_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index b8504d5d08..60d6308713 100644 +index b8504d5d08e..60d63087134 100644 --- a/PCbuild/venvwlauncher.vcxproj +++ b/PCbuild/venvwlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -822,7 +822,7 @@ index b8504d5d08..60d6308713 100644 PYW_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj -index 32cedc9b44..c9abee1d69 100644 +index 32cedc9b444..c9abee1d691 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -96,6 +96,18 @@ @@ -845,7 +845,7 @@ index 32cedc9b44..c9abee1d69 100644 diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj -index 1c776fb0da..36dec23c20 100644 +index 1c776fb0da3..36dec23c203 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -93,6 +93,12 @@ @@ -862,7 +862,7 @@ index 1c776fb0da..36dec23c20 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj -index dd830b3b6a..fef2c5b9f4 100644 +index dd830b3b6aa..fef2c5b9f47 100644 --- a/PCbuild/xxlimited_35.vcxproj +++ b/PCbuild/xxlimited_35.vcxproj @@ -93,6 +93,12 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 2ef8f8c0..dfb0d320 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From fae08eb999d62039e0dbbeb65761f0e4c507c471 Mon Sep 17 00:00:00 2001 +From c1a286ccbf25c4e2fd6d74a04a63fa30b37b162d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/22] cross compile darwin @@ -11,7 +11,7 @@ By Isuru Fernando. 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py -index c5b6048036..7470545466 100755 +index c5b60480369..7470545466d 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''): @@ -29,7 +29,7 @@ index c5b6048036..7470545466 100755 try: import plistlib diff --git a/configure b/configure -index 6dc8a66e48..552597c021 100755 +index 4dfaeecfc0b..0ca93afc4dc 100755 --- a/configure +++ b/configure @@ -4267,6 +4267,9 @@ then @@ -53,7 +53,7 @@ index 6dc8a66e48..552597c021 100755 _host_cpu= ;; diff --git a/configure.ac b/configure.ac -index 8a32cb58f4..36b565af1b 100644 +index 0d6df8e24e4..2921409d976 100644 --- a/configure.ac +++ b/configure.ac @@ -547,6 +547,9 @@ then diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index 1020b857..36008089 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From eaf0b19149ec28a231e0c73e36b2a6fdc29c250e Mon Sep 17 00:00:00 2001 +From 88e6e4ec931fd3bbbb3d162e72b9744054b6b919 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/22] Fix TZPATH on windows @@ -8,7 +8,7 @@ Subject: [PATCH 10/22] Fix TZPATH on windows 1 file changed, 1 insertion(+) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441bd1..8e1d823a4c 100644 +index 122d441bd19..8e1d823a4c4 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -666,6 +666,7 @@ def _init_config_vars(): diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index 8fafc58d..5b64e847 100644 --- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,4 +1,4 @@ -From dfa56fb035e286513a96ab1ee60a438a61295aac Mon Sep 17 00:00:00 2001 +From 64ee6c92a7ad8f8ec79dc834f15ac4a4fb4b3925 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/22] Make dyld search work with SYSTEM_VERSION_COMPAT=1 @@ -15,7 +15,7 @@ as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index d2fe525dd4..62eaf1d889 100644 +index d2fe525dd4d..62eaf1d8896 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1460,7 +1460,7 @@ copy_com_pointer(PyObject *self, PyObject *args) diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 23f0716d..eb572bc5 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 4cfee77c16d2985f27f61ed831027f18ad51a641 Mon Sep 17 00:00:00 2001 +From c9214ae4fa1a6b5e876dbffa54e6f88fbc235a58 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/22] Unvendor bzip2 @@ -9,7 +9,7 @@ Subject: [PATCH 12/22] Unvendor bzip2 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 0402f7a9aa..569c7c5de9 100644 +index 0402f7a9aaa..569c7c5de93 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -94,7 +94,7 @@ @@ -47,7 +47,7 @@ index 0402f7a9aa..569c7c5de9 100644 diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters -index 7c0b516253..c1f960608c 100644 +index 7c0b5162537..c1f960608c3 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -21,33 +21,9 @@ diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 3b921e6f..e38bd4da 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From a346f51234b70e907c8bac4156e2f67f209ca380 Mon Sep 17 00:00:00 2001 +From 21ea30e88e6203932857bacaf530e80c3f96cccd Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/22] Unvendor libffi @@ -8,7 +8,7 @@ Subject: [PATCH 13/22] Unvendor libffi 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/PCbuild/libffi.props b/PCbuild/libffi.props -index 22c9550e2c..40ddb08d2b 100644 +index 22c9550e2c0..40ddb08d2b0 100644 --- a/PCbuild/libffi.props +++ b/PCbuild/libffi.props @@ -2,20 +2,11 @@ diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index ae34ec8a..f45da3c0 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From dcb96fc3a6604875421ad94654bad12424db494c Mon Sep 17 00:00:00 2001 +From 85d981a27052981abda233410ce7a8d0b86cab98 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/22] Unvendor tcltk @@ -9,7 +9,7 @@ Subject: [PATCH 14/22] Unvendor tcltk 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 0484a5c81f..d1393c914d 100644 +index 0484a5c81f6..d1393c914d1 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -126,12 +126,6 @@ @@ -26,7 +26,7 @@ index 0484a5c81f..d1393c914d 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 9d5189b3b8..a8f5b8811c 100644 +index 9d5189b3b8e..a8f5b8811c6 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -17,13 +17,11 @@ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index bbb3882a..58935c73 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From e2ef6df310bc7877332881ac140aab4d884a887e Mon Sep 17 00:00:00 2001 +From 9720d63e704ea24d45eb6daf20c577d575105fc1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/22] unvendor xz @@ -8,7 +8,7 @@ Subject: [PATCH 15/22] unvendor xz 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 0565132363..e8b2704cee 100644 +index 0565132363e..e8b2704ceed 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -93,15 +93,15 @@ diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index d96dc979..63fc964b 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 91fcbab935cefba1855808e5b275d2b81b79d53a Mon Sep 17 00:00:00 2001 +From 81e896972a5b3d7416ece2020f28473de69a4919 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/22] unvendor zlib @@ -9,7 +9,7 @@ Subject: [PATCH 16/22] unvendor zlib 2 files changed, 4 insertions(+), 95 deletions(-) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 9390c4d7d7..b36c48abb3 100644 +index 9390c4d7d76..b36c48abb36 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -78,7 +78,7 @@ index 9390c4d7d7..b36c48abb3 100644 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 67a32f653d..9c064964b5 100644 +index 67a32f653de..9c064964b55 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -717,39 +717,6 @@ diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index 266edb53..d4e61a6a 100644 --- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,4 +1,4 @@ -From 7c7ce51dae3af7b8325e1ccdf8bcd7225b2b5065 Mon Sep 17 00:00:00 2001 +From c94319a50e11880fe168d0f708673bd28fb6987f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/22] Do not pass -g to GCC when not Py_DEBUG @@ -10,7 +10,7 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 552597c021..cff40b9959 100755 +index 0ca93afc4dc..626be52a9e7 100755 --- a/configure +++ b/configure @@ -5465,9 +5465,9 @@ if test $ac_test_CFLAGS; then @@ -35,7 +35,7 @@ index 552597c021..cff40b9959 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 36b565af1b..538122985c 100644 +index 2921409d976..e188b51f51d 100644 --- a/configure.ac +++ b/configure.ac @@ -2255,7 +2255,7 @@ then diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 60dde921..6913db0a 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From 578d46ad1930ab405cd908d8ec68368db36f0801 Mon Sep 17 00:00:00 2001 +From 6be13524c8e7fbb9c9f58a7ad915f79bc9c38af9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/22] Unvendor expat @@ -11,7 +11,7 @@ Subject: [PATCH 18/22] Unvendor expat 4 files changed, 10 insertions(+), 104 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 20cc09d63f..de476a6add 100644 +index 20cc09d63ff..de476a6adde 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -93,36 +93,19 @@ @@ -56,7 +56,7 @@ index 20cc09d63f..de476a6add 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index bc14e31f32..7cc8e9a3b9 100644 +index bc14e31f32b..7cc8e9a3b9b 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -17,70 +17,14 @@ @@ -133,7 +133,7 @@ index bc14e31f32..7cc8e9a3b9 100644 \ No newline at end of file + diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 3be4ac06dd..e253b39c86 100644 +index 3be4ac06dd8..e253b39c866 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -90,23 +90,19 @@ @@ -165,7 +165,7 @@ index 3be4ac06dd..e253b39c86 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index fd22fc8c47..41c73b434b 100644 +index fd22fc8c477..41c73b434b9 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -11,31 +11,14 @@ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 19a4e882..fd840ab2 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From fd9f5630ec6e354261274f5cb79501024197f3a1 Mon Sep 17 00:00:00 2001 +From 94c0152482830a65cad2cf0c320e433f9b594411 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/22] Remove unused readelf @@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``. 1 file changed, 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4a957fb004..689ece9d24 100644 +index 0e64ccc5c21..a99e08f1ff4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,7 +38,6 @@ CC= @CC@ diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch index ac282264..b49b83cc 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,16 +1,16 @@ -From 46ed1d097913ea6752125324ecf254a51e4927b4 Mon Sep 17 00:00:00 2001 +From 6e7531b79f72ff317442f90e8efbb49080a9898b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/22] Don't checksharedmods if cross-compiling --- - Makefile.pre.in | 2 +- - if_runnable.sh | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) + Makefile.pre.in | 2 +- + if_runnable.sh | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index 689ece9d24..913cbd8e23 100644 +index a99e08f1ff4..af49f0f2b7e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -994,7 +994,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt @@ -24,7 +24,7 @@ index 689ece9d24..913cbd8e23 100644 rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/if_runnable.sh b/if_runnable.sh new file mode 100755 -index 0000000000..14f84a8597 +index 00000000000..dcfde5b751e --- /dev/null +++ b/if_runnable.sh @@ -0,0 +1,10 @@ diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 5934acc0..a25c167b 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 9278cac7fd97574e551bf989795d61381131ac97 Mon Sep 17 00:00:00 2001 +From 05a52dffc4e3ef27079ea1acd09cf9a6eac55f21 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/22] Override configure LIBFFI @@ -8,7 +8,7 @@ Subject: [PATCH 21/22] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index cff40b9959..50cbcc1ac7 100755 +index 626be52a9e7..4dab7d58af2 100755 --- a/configure +++ b/configure @@ -14095,7 +14095,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes diff --git a/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch b/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch index 8b087e7b..e42e3c15 100644 --- a/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch +++ b/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch @@ -1,4 +1,4 @@ -From bbc64a8ca9d69dbfd220a3924a71f7ea12cd43da Mon Sep 17 00:00:00 2001 +From d1de471d3abae6bef7efb96fab37e310133faf19 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Thu, 14 Dec 2023 22:16:33 +0100 Subject: [PATCH 22/22] Allow linking ncursesw/panelw on macOS if available @@ -10,7 +10,7 @@ Signed-off-by: Marcel Bargull 2 files changed, 10 deletions(-) diff --git a/configure b/configure -index 50cbcc1ac7..0108f553bf 100755 +index 4dab7d58af2..dac9920fb3f 100755 --- a/configure +++ b/configure @@ -25714,7 +25714,6 @@ fi @@ -46,7 +46,7 @@ index 50cbcc1ac7..0108f553bf 100755 if test "x$have_curses" = xncurses then : diff --git a/configure.ac b/configure.ac -index 538122985c..284c0daddd 100644 +index e188b51f51d..434f18b2d3d 100644 --- a/configure.ac +++ b/configure.ac @@ -6432,8 +6432,6 @@ AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.]) From eb18e9edbd9319162f756ed29264442e86c9cfe4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 10 Sep 2024 08:38:28 +0200 Subject: [PATCH 3/4] remove obsolete ci-setup pin --- conda-forge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 9ee5f49f..f0820d63 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -14,5 +14,4 @@ github: tooling_branch_name: main conda_build: pkg_format: '2' -remote_ci_setup: [conda-forge-ci-setup=3] test: native_and_emulated From a07c13895163ea69e3ca20a9e4f11e28e19dddbb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 10 Sep 2024 08:43:06 +0200 Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.09.18.43.05 --- ...ild_typedebugchannel_targetsconda-forge_python_debug.yaml | 4 ++-- ..._64_build_typereleasechannel_targetsconda-forge_main.yaml | 4 ++-- ...ild_typedebugchannel_targetsconda-forge_python_debug.yaml | 4 ++-- ...h64_build_typereleasechannel_targetsconda-forge_main.yaml | 4 ++-- ...ild_typedebugchannel_targetsconda-forge_python_debug.yaml | 4 ++-- ...4le_build_typereleasechannel_targetsconda-forge_main.yaml | 4 ++-- ...ild_typedebugchannel_targetsconda-forge_python_debug.yaml | 4 ++-- ..._64_build_typereleasechannel_targetsconda-forge_main.yaml | 4 ++-- ...ild_typedebugchannel_targetsconda-forge_python_debug.yaml | 4 ++-- ...m64_build_typereleasechannel_targetsconda-forge_main.yaml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- .scripts/run_win_build.bat | 2 +- build-locally.py | 5 ++++- 14 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index 3b3d4b76..4b680193 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml index 44643869..83fab33b 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index 8959a117..efc5b726 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml index 256d6c49..4481a6a3 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml index 16804e7b..d9fd9c84 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml index d955476d..7e709b55 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 expat: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index ab3f07f7..2991ebef 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' libffi: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml index 614f0f48..79eb5f27 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' libffi: diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index 6bc8d62b..5f80ce09 100644 --- a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' libffi: diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml index 3796ea1e..3aecaf80 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' expat: - '2' libffi: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 837e09f1..3a0db7a3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 26c31365..420f051c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7a6d8abd..65650bf2 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration diff --git a/build-locally.py b/build-locally.py index d78427b5..8ac9b846 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform