From 60924286b9d3f011f4eba563c9a15530b17304b7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 13 Aug 2026 14:16:58 +1100 Subject: [PATCH] python v3.12.14 --- recipe/meta.yaml | 6 +- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 2 +- ...0002-Win32-Do-not-download-externals.patch | 2 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 9 +-- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 6 +- recipe/patches/0005-Unvendor-openssl.patch | 2 +- recipe/patches/0006-Unvendor-sqlite3.patch | 2 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 2 +- recipe/patches/0008-Doing-d1trimfile.patch | 6 +- .../patches/0009-cross-compile-darwin.patch | 2 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 2 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 2 +- recipe/patches/0012-Unvendor-bzip2.patch | 2 +- recipe/patches/0013-Unvendor-libffi.patch | 2 +- recipe/patches/0014-Unvendor-tcltk.patch | 2 +- recipe/patches/0015-unvendor-xz.patch | 2 +- recipe/patches/0016-unvendor-zlib.patch | 2 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 2 +- recipe/patches/0018-Unvendor-expat.patch | 56 +++++++++---------- .../patches/0019-Remove-unused-readelf.patch | 4 +- ...t-checksharedmods-if-cross-compiling.patch | 6 +- .../0021-Override-configure-LIBFFI.patch | 2 +- ...cursesw-panelw-on-macOS-if-available.patch | 2 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 2 +- 24 files changed, 64 insertions(+), 63 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf855d9e7..eb49e4a18 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ -{% set version = "3.12.13" %} +{% set version = "3.12.14" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 1 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -46,7 +46,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 }}{{ dev }}/ - sha256: c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 + sha256: 5c8462af5790baf43a321a1559dbe0db06d1be4300fb85fb53c40060668e548a {% endif %} patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch 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 2a0be3886..3ea2d3d2e 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 0775a5a7255a3419ce117d61694e64e914e9ac7b Mon Sep 17 00:00:00 2001 +From cac3448407a8edcc3514731958e2a603fa40340c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/23] Win32: Change FD_SETSIZE from 512 to 2048 diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index ae78ae4f2..eac172db0 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 fbd9cd3929314f7f14a3de21397ca14355ceee2e Mon Sep 17 00:00:00 2001 +From 68d58fb4616eceaccd14bb0a912df825d7b44226 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/23] Win32: Do not download externals 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 44e1bacfe..05d399206 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,7 +1,8 @@ -From d2c9a52026fcbe57ccf019f9e7870fa94082f7c8 Mon Sep 17 00:00:00 2001 +From f5e4eb7db8e8714e5c6b825cd4414f87a54a0b11 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH] Fix find_library so that it looks in sys.prefix/lib first +Subject: [PATCH 03/23] Fix find_library so that it looks in sys.prefix/lib + first --- Lib/ctypes/macholib/dyld.py | 4 ++++ @@ -24,7 +25,7 @@ index 583c47daff3..ab9b01c87e2 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index c550883e7c7..8f55134805f 100644 +index c550883e7c7..78b0b014f09 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ def find_library(name): @@ -46,7 +47,7 @@ index c550883e7c7..8f55134805f 100644 + return None + for fullname in (name, "lib%s.so" % (name)): + path = os.path.join(sys.prefix, 'lib', fullname) -+ if os.path.exists(path) and not os.path.isdir(path): ++ if os.path.exists(path): + return path + return None + 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 0983cecb0..0da33cc85 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 8e8152b1f3e01fee9573f9ec1d07a1e4aa341578 Mon Sep 17 00:00:00 2001 +From 316a01dc73fe01c033bb1a2a47b3d2e28bff305f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/23] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS @@ -23,7 +23,7 @@ index 0a310000751..b0efef2f539 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index 9913fcba497..15a06c7e44b 100644 +index 29a6b300189..75441c36263 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -51,6 +51,7 @@ @@ -34,7 +34,7 @@ index 9913fcba497..15a06c7e44b 100644 # ** Values calculated at runtime ** # config -- [in/out] dict of the PyConfig structure -@@ -673,7 +674,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -666,7 +667,7 @@ def search_up(prefix, *landmarks, test=isfile): else: pythonpath.append(joinpath(prefix, ZIP_LANDMARK)) diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 5055580a4..44b704b68 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From bbdaa0da22722cb184a3b96ea40c53ada029ee1c Mon Sep 17 00:00:00 2001 +From 5918e2a035d60cfaf986ee2c90173f8af73894bc Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/23] Unvendor openssl diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 2ea03e362..8be1d8979 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 9650cc963145826350898204165517a07fb65e3e Mon Sep 17 00:00:00 2001 +From edf294c860d1b0a424bc0b8ba12b38409278cb7d Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/23] Unvendor sqlite3 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index bf769e317..24af99ba7 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 74f376c9897694fee7a8a810f32560e7341a73b5 Mon Sep 17 00:00:00 2001 +From b6cee93474e3b0d46cd55a0960a7e4a64c6c2250 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/23] Add CondaEcosystemModifyDllSearchPath() diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index fab973824..052efafee 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From b152af0f8b1afa2072aa101dbbd0f2361527074e Mon Sep 17 00:00:00 2001 +From 2616e76edb845f0dd372fbbffaa778f2bb46224f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/23] Doing d1trimfile @@ -156,7 +156,7 @@ index 0916f1a2d37..17a4cbfcd7c 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 8da5244bac0..20cc09d63ff 100644 +index e7b7a6d2064..964c95c9f7e 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -586,7 +586,7 @@ index 4dd42ab98a9..7c2dbc7e701 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 001f8afd89b..3be4ac06dd8 100644 +index 97eb7338dca..d159933293a 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 1494177f0..3ee8324a3 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From d633b3ec8aa59938e5db738e04323523062fead9 Mon Sep 17 00:00:00 2001 +From 7dc5c9baed91f4bd3d75f90b0fb1cf7d18a85111 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/23] cross compile darwin diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index 5da4cda2d..f9998da48 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 924e84febaf1859c60d125e4b178b5377b011ba1 Mon Sep 17 00:00:00 2001 +From 89dd5d347d5760a796e4a1818282f13aeb170771 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/23] Fix TZPATH on windows 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 aa4f977fe..108c900b1 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 e87ab1a2384c63431873de04a35b79db61fa9fde Mon Sep 17 00:00:00 2001 +From b531679e831414bf963b9cb8bbf4c91fdc086d6a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/23] Make dyld search work with SYSTEM_VERSION_COMPAT=1 diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 2c2251148..ec3c21847 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From f41d888504a93f76fc2324a635b040c2fde0b351 Mon Sep 17 00:00:00 2001 +From 975a185e9fdbed8e7b36aee67b725c092b6e9634 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/23] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 5cb64501a..fd93cb057 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 4554ca8b6340bcc4601c3392d5395bb72058a098 Mon Sep 17 00:00:00 2001 +From 03902b54b51e4a0d41be8574a78af99cc7a3663a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/23] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 5c4b6b629..8eaa37378 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From 5a71f5410441b01ed16aa4324474e13f6add371d Mon Sep 17 00:00:00 2001 +From 47a4683326ac8cc1f0627f25d117f06e4efc731e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/23] Unvendor tcltk diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index c29eb3a01..c27b6c6ed 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From e4eadda8cf6a20b567d023848ab0927e693686be Mon Sep 17 00:00:00 2001 +From 87c5eee8033cca90800b4798b4bbe234cc2efbc8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/23] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 41e54179c..e74ed3523 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 41612968e57ecae50198fdb7f97c68c68c99e952 Mon Sep 17 00:00:00 2001 +From d3ea27406c326d72529b34401a61bfb50b437330 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/23] unvendor zlib 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 8c1835c15..991c5db63 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 39c25affe5f1c9e2d2eea88e3bb47c4cefbb4070 Mon Sep 17 00:00:00 2001 +From 50d2ecfda45d51bee6e19ae862ce8b92df2293f1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/23] Do not pass -g to GCC when not Py_DEBUG diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 2fb3c1736..1b36c0067 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,20 +1,20 @@ -From 8fae58ad79e23d6b3fe62ab58f06cce1351aa3e6 Mon Sep 17 00:00:00 2001 +From 334aba5522f9b5ae7dffd517c735fe6c390a6b20 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/23] Unvendor expat --- - PCbuild/_elementtree.vcxproj | 25 ++---------- - PCbuild/_elementtree.vcxproj.filters | 58 +--------------------------- - PCbuild/pyexpat.vcxproj | 12 ++---- - PCbuild/pyexpat.vcxproj.filters | 19 +-------- - 4 files changed, 10 insertions(+), 104 deletions(-) + PCbuild/_elementtree.vcxproj | 26 ++---------- + PCbuild/_elementtree.vcxproj.filters | 59 ---------------------------- + PCbuild/pyexpat.vcxproj | 14 ++----- + PCbuild/pyexpat.vcxproj.filters | 23 ----------- + 4 files changed, 8 insertions(+), 114 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 20cc09d63ff..de476a6adde 100644 +index 964c95c9f7e..de476a6adde 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj -@@ -93,36 +93,19 @@ +@@ -93,37 +93,19 @@ @@ -36,10 +36,11 @@ index 20cc09d63ff..de476a6adde 100644 - - - +- - - - -- +- - - - @@ -56,10 +57,10 @@ index 20cc09d63ff..de476a6adde 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index bc14e31f32b..7cc8e9a3b9b 100644 +index f6b55d8ff82..88a13faa683 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,70 +17,14 @@ +@@ -17,69 +17,10 @@ {f99990ba-cd06-40cc-8f28-d2d424ec13be} @@ -79,6 +80,9 @@ index bc14e31f32b..7cc8e9a3b9b 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -88,7 +92,7 @@ index bc14e31f32b..7cc8e9a3b9b 100644 - - Header Files\expat - -- +- - Header Files\expat - - @@ -126,17 +130,11 @@ index bc14e31f32b..7cc8e9a3b9b 100644 - Resource Files - - -- -\ No newline at end of file -+ diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 3be4ac06dd8..e253b39c866 100644 +index d159933293a..e253b39c866 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj -@@ -90,23 +90,19 @@ +@@ -90,25 +90,19 @@ @@ -153,6 +151,8 @@ index 3be4ac06dd8..e253b39c866 100644 + - +- +- - - - @@ -165,14 +165,20 @@ index 3be4ac06dd8..e253b39c866 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index fd22fc8c477..41c73b434b9 100644 +index 230531033fc..b8280b4049c 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,31 +11,14 @@ +@@ -11,33 +11,10 @@ {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} - +- +- Header Files +- +- +- Header Files +- - - Header Files - @@ -196,9 +202,3 @@ index fd22fc8c477..41c73b434b9 100644 - Resource Files - - -- -\ No newline at end of file -+ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index d797972ef..ea59303ce 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From dae2875205a2a524ff6544e2005d953c44153edf Mon Sep 17 00:00:00 2001 +From 512a7f55920c4b6ef84c597559023ead15411cd6 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/23] 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 7ca3dc62c01..c0687ba25e1 100644 +index 823633cbc72..e4881f97fb8 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 a981753cd..e93748794 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From a73680fd5ae3fabd950fea7d4269b89e36ae7bb4 Mon Sep 17 00:00:00 2001 +From 8d0cf3c2ba9be7f33f510cf92a8e6c903a1314f7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/23] Don't checksharedmods if cross-compiling @@ -10,10 +10,10 @@ Subject: [PATCH 20/23] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index c0687ba25e1..7e989fe102f 100644 +index e4881f97fb8..fe8f98364bb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -994,7 +994,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt +@@ -997,7 +997,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt # dependency on BUILDPYTHON ensures that the target is run last .PHONY: checksharedmods checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 5ad4967b2..c6e454d6c 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From f744e32298498c2b43b963630e7498a993028c26 Mon Sep 17 00:00:00 2001 +From d5f8722f6e0ba52f77812cab70d5791d2e1fee79 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/23] Override configure LIBFFI 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 972cb27be..f6b3e03c9 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 ea8f24b7ef7b7f05bbe958db3bf0acb3ab6de412 Mon Sep 17 00:00:00 2001 +From 5ad325a0013e0c1606bfe7aeb1ae37198725a721 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Thu, 14 Dec 2023 22:16:33 +0100 Subject: [PATCH 22/23] Allow linking ncursesw/panelw on macOS if available diff --git a/recipe/patches/0023-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0023-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch index 5ef84be79..756016e7a 100644 --- a/recipe/patches/0023-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch +++ b/recipe/patches/0023-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch @@ -1,4 +1,4 @@ -From 11ee68bc7a0030c8660d26f93b68484759e0e1ca Mon Sep 17 00:00:00 2001 +From aa6781489ba39e836d64966242ef04c7e1839215 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 23/23] Do not define pid_t as it might conflict with the