From f2a172ee58ee603f414048466d715379f8cc4274 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 26 Oct 2026 06:52:50 +0000 Subject: [PATCH 1/2] python 3.13.18 --- recipe/meta.yaml | 4 +- ...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 | 2 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 2 +- recipe/patches/0005-Unvendor-openssl.patch | 2 +- recipe/patches/0006-Unvendor-sqlite3.patch | 2 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 2 +- recipe/patches/0008-Doing-d1trimfile.patch | 10 ++--- .../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 | 44 +++++++++++++------ .../patches/0019-Remove-unused-readelf.patch | 4 +- ...t-checksharedmods-if-cross-compiling.patch | 6 +-- .../0021-Override-configure-LIBFFI.patch | 2 +- recipe/patches/0022-Unvendor-libmpdec.patch | 2 +- recipe/patches/0023-Brand-conda-forge.patch | 2 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 2 +- ...5-Search-LLVM_ROOT-for-llvm-binaries.patch | 2 +- 26 files changed, 63 insertions(+), 47 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cbae2d5ba..4f7568e6b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.13.17" %} +{% set version = "3.13.18" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} @@ -64,7 +64,7 @@ package: source: - 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: 6020bd10aff3bf4821be16f088ebb1591beb7b811dcd8fab1da8f7c22a7b27e7 + sha256: abb0102e6d4ae027509bcb82327d9dd85515b44a3ba8ad538cfc5e9847029f68 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.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 8fce75555..1aad50842 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 991f2abe6accd2070f067429d40f887cfe728847 Mon Sep 17 00:00:00 2001 +From b324c1730f2c0c6ee43000948176a33319860df5 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/25] 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 d24144ad1..4561ccc1e 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 c7d48c7387926b3b7403eed2e9d22df499034e9a Mon Sep 17 00:00:00 2001 +From 37c48d7e973e7296531da35a5db60df85c4c9e87 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/25] 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 75838b8ff..cc77a3aa3 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 20455fb7a6f55de85c6236f11e36ac8ac8cfb0e9 Mon Sep 17 00:00:00 2001 +From 912dd2a1cc2a3f89eef9196c7aea22900e415b23 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/25] Fix find_library so that it looks in sys.prefix/lib 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 db59f0f99..bde36794d 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 8563e9b808b53973b24ecb460233730505fd5c74 Mon Sep 17 00:00:00 2001 +From f5376852f88f72fef85c847858f20a9e135573d0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index d40762b3c..0e5d2e2b3 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 2a2dd9ea6d9518f5aefaa64f76fe16662605d7c3 Mon Sep 17 00:00:00 2001 +From 4bfa6119fb93ae2bcbab439c7101960530b02737 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/25] Unvendor openssl diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index e889e58f3..6487cbe84 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 2a1ad05f5324d444047d4ef8696489eb835609fb Mon Sep 17 00:00:00 2001 +From 80a527a7083e2c92b3d6957f5f78bbaa31476f31 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/25] Unvendor sqlite3 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index 52f221903..3b6b4ccc3 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 72c8f5d4c2133b6f4363f243ec1aa16ed9b43b69 Mon Sep 17 00:00:00 2001 +From 9e0c1065b8bebcd947b97cf55954cbc6b16f933d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/25] Add CondaEcosystemModifyDllSearchPath() diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index ea29690d1..b338b2bc0 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 9c33dafaaccfb0d777f70f61ebec841485d4f917 Mon Sep 17 00:00:00 2001 +From e8a172d7188535d66988878331f9e08a247ad188 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/25] Doing d1trimfile @@ -169,7 +169,7 @@ index ee7421484b..e9d60b4db1 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index c102da85e9..8d5117e804 100644 +index cd8c1ff173..c33e8e3c23 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -375,7 +375,7 @@ index f482734ba1..70943daa02 100644 $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index ce21f992ff..34561515c1 100644 +index 16595c782b..95f45376e6 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -396,7 +396,7 @@ index ce21f992ff..34561515c1 100644 + - + diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj index 4e721e8ce0..3fec7516ed 100644 --- a/PCbuild/_testbuffer.vcxproj @@ -632,7 +632,7 @@ index 4dd42ab98a..7c2dbc7e70 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 92ecac2f7a..d517f9392b 100644 +index 57d565fa28..d9b6beafb4 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 9f1d421e3..9b74508ed 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From d919b18325ee2b397f5e32fa8902118570791c21 Mon Sep 17 00:00:00 2001 +From 15246153401be728be3a7d14848279a14d9a39b0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/25] cross compile darwin diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index f76b5af27..edd8d7cf8 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From f909be9b501086add90d23c0b6769d9ccefd940a Mon Sep 17 00:00:00 2001 +From e97d7a6daaed000ba148d44858b7dfccc800ca1c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/25] 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 808bcd8fa..7e9f0fc42 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 fcb7b10eb231c5a93678ec353df63e79f7c00f85 Mon Sep 17 00:00:00 2001 +From fa0967917af97a5c5a860cc98655fa6f9ea6a25c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/25] 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 a674bbb64..988e2020d 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From f0175326b5046b064d8c00daf8717465bfbf7e32 Mon Sep 17 00:00:00 2001 +From f21e6caf8c0fd6ea58c290fbf62c1ceeb0aaffe9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/25] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 4c5002b91..f8c0e388e 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From ffa81e974f061ca837c06d1a6ba0bb3c683d6b02 Mon Sep 17 00:00:00 2001 +From ff3abc1bfa238fe692489460a09ba71840cd5af8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/25] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 4989b21a5..b43bbc40a 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From 5b4eca524fcf440da14a54082ffba9644e072df5 Mon Sep 17 00:00:00 2001 +From 43b396613b3ea80d12a9c74df377d9d84390d63f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/25] Unvendor tcltk diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 8c090bb67..3193a1134 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From c876c1ce48c1d79386f8880bc1e163e794f7da68 Mon Sep 17 00:00:00 2001 +From 057636c8e13f77332bb68f624d092622751498bc Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/25] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 5fdf2c3e8..8a1296a5d 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 8a92097e08d33c3982e97b1e7af197bd31a352d9 Mon Sep 17 00:00:00 2001 +From ec21e6df6a8d0e61544fc709055216df058b4005 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/25] 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 da80fc13f..1c7421cde 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 4f6e994c7b09526e723fcd5fe335e7873f94f63d Mon Sep 17 00:00:00 2001 +From bc7a7c5fcb5aed0a0e9878a00d3db0b48c8bab5a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/25] 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 3d2db2481..485e40ce8 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,20 +1,20 @@ -From 0163b10516b4d363c47f1737e5f9e1e1c434accb Mon Sep 17 00:00:00 2001 +From 9c2d721da3d7e2c9beac2baf3d1bdd555cd8717e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/25] Unvendor expat --- - PCbuild/_elementtree.vcxproj | 27 ++---------- - PCbuild/_elementtree.vcxproj.filters | 62 ---------------------------- - PCbuild/pyexpat.vcxproj | 15 ++----- - PCbuild/pyexpat.vcxproj.filters | 26 ------------ - 4 files changed, 8 insertions(+), 122 deletions(-) + PCbuild/_elementtree.vcxproj | 29 ++---------- + PCbuild/_elementtree.vcxproj.filters | 68 ---------------------------- + PCbuild/pyexpat.vcxproj | 17 ++----- + PCbuild/pyexpat.vcxproj.filters | 32 ------------- + 4 files changed, 8 insertions(+), 138 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 8d5117e804..f47bcd8e4e 100644 +index c33e8e3c23..f47bcd8e4e 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj -@@ -93,38 +93,19 @@ +@@ -93,40 +93,19 @@ @@ -46,11 +46,13 @@ index 8d5117e804..f47bcd8e4e 100644 - - - +- - - - +- - - - @@ -58,10 +60,10 @@ index 8d5117e804..f47bcd8e4e 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index 9e2e062af3..88a13faa68 100644 +index 2ce694e1b5..88a13faa68 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,72 +17,10 @@ +@@ -17,78 +17,10 @@ {f99990ba-cd06-40cc-8f28-d2d424ec13be} @@ -111,6 +113,9 @@ index 9e2e062af3..88a13faa68 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -122,6 +127,9 @@ index 9e2e062af3..88a13faa68 100644 Source Files +- +- Source Files\expat +- - - Source Files\expat - @@ -135,10 +143,10 @@ index 9e2e062af3..88a13faa68 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index d517f9392b..5fe782f11a 100644 +index d9b6beafb4..5fe782f11a 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj -@@ -90,26 +90,19 @@ +@@ -90,28 +90,19 @@ @@ -158,11 +166,13 @@ index d517f9392b..5fe782f11a 100644 - - - +- - - - +- - - - @@ -170,10 +180,10 @@ index d517f9392b..5fe782f11a 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index e63cb9c630..b8280b4049 100644 +index baa06e4491..b8280b4049 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,36 +11,10 @@ +@@ -11,42 +11,10 @@ {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} @@ -187,6 +197,9 @@ index e63cb9c630..b8280b4049 100644 - - Header Files - +- +- Header Files +- - - Header Files - @@ -198,6 +211,9 @@ index e63cb9c630..b8280b4049 100644 Source Files +- +- Source Files +- - - Source Files - diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 193dfdacb..fe39de0d7 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From f0bef9fef4f72539482555218236ef9ba7eb1aba Mon Sep 17 00:00:00 2001 +From 6828cd5e6bbfb1fffc92a54304481ec9244b121b Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/25] 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 8fdbbd83b4..0ccc8d58a8 100644 +index 414b466cf6..af445a518b 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 e2c5d6bfb..ff91f8b49 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 7397ecbceada52e970a0407ad80ca1e5e2568964 Mon Sep 17 00:00:00 2001 +From 80b5958d15dafcc511fb0b474912a21163b2d1c9 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling @@ -10,10 +10,10 @@ Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0ccc8d58a8..326a377dd3 100644 +index af445a518b..69cf8291d5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1377,7 +1377,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt +@@ -1381,7 +1381,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 f2f5fb04b..5def387bd 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 23f3700150ebbd060a9d9ce5447f59624f4c90d0 Mon Sep 17 00:00:00 2001 +From fb726235414be9403757ee19ac61c5a8c47a5ef5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/25] Override configure LIBFFI diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index 499ed29ba..6ece133ff 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From d868061c1217cf53bbbde0b201f7e0578c958242 Mon Sep 17 00:00:00 2001 +From 5f05b70600e237092abea50e6a789b28b81d4fa1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/25] Unvendor libmpdec diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 214f4169b..1ce050b30 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 1ef15cb97c258980b080bd9df3e1edd65c0d0ae3 Mon Sep 17 00:00:00 2001 +From 123d2e238326c135dd3f664fdf80b455a181cd8e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/25] Brand conda-forge diff --git a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch index fc9af1a26..9503cbeb1 100644 --- a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch +++ b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch @@ -1,4 +1,4 @@ -From 5d4209798b637aea3a21da997914a022a97a059d Mon Sep 17 00:00:00 2001 +From 7b694da995fe9259d278cd02997cf0bffe34844e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/25] Do not define pid_t as it might conflict with the diff --git a/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch b/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch index f41295e8f..2bdd90f0e 100644 --- a/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch +++ b/recipe/patches/0025-Search-LLVM_ROOT-for-llvm-binaries.patch @@ -1,4 +1,4 @@ -From c94d712bd94cdff4e46420f5e1f5a879326d521c Mon Sep 17 00:00:00 2001 +From 918ab6350562e69b52c902c2baad6ba604bdb044 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 3 Sep 2025 13:32:24 +0200 Subject: [PATCH 25/25] Search LLVM_ROOT for llvm binaries From a8f3d4768cd1f171af2bc92c3df59fe0c2eda46f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 26 Oct 2026 06:53:23 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 2026.10.24 and conda-forge-pinning 2026.10.25.07.44.23 Other tools: - conda-build 26.9.1 - rattler-build 0.77.0 - rattler-build-conda-compat 1.4.22 --- ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ ...nda-forge_python_debugfreethreadingno.yaml | 2 ++ ...da-forge_python_debugfreethreadingyes.yaml | 2 ++ ...argetsconda-forge_mainfreethreadingno.yaml | 2 ++ ...rgetsconda-forge_mainfreethreadingyes.yaml | 2 ++ .circleci/config.yml | 25 ------------------- .scripts/run_docker_build.sh | 7 +++++- 14 files changed, 30 insertions(+), 26 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 5100d60f7..4101b6e93 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 2b5a95f60..3ec39defd 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index b4c74c44c..3912ef21f 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 286e411e8..007c6a912 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index 5ebfde0e1..2b6d6d2d7 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - debug bzip2: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index c40d48605..459d888e5 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - debug bzip2: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 82070edf0..6cf775046 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - release bzip2: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index b831cd859..0bd49ed7a 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/aarch64 build_type: - release bzip2: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index f5eb7e681..4653219f3 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 43607e9db..eededa84b 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - debug bzip2: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 514514722..0ada3f3e9 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 84630badb..993e5dc66 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8b4ef2f99..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,25 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: jinja-yaml -*- - -version: 2 - -jobs: - build: - working_directory: ~/test - machine: - image: ubuntu-2004:current - steps: - - run: - # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. - command: exit 0 - -workflows: - version: 2 - build_and_test: - jobs: - - build: - filters: - branches: - ignore: - - /.*/ diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 4715f5df4..67c42c717 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -69,6 +69,11 @@ if [ -z "${DOCKER_IMAGE}" ]; then fi fi +if [ -z "${DOCKER_PLATFORM}" ]; then + # this is set unconditionally in the variant configs -> no fallback + DOCKER_PLATFORM=$(cat .ci_support/${CONFIG}.yaml | grep '^DOCKER_PLATFORM:$' -A 1 | tail -n 1 | cut -b 3-) +fi + mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" @@ -110,7 +115,7 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" export IS_PR_BUILD="${IS_PR_BUILD:-False}" -${DOCKER_EXECUTABLE} pull "${DOCKER_IMAGE}" +${DOCKER_EXECUTABLE} pull --platform ${DOCKER_PLATFORM} "${DOCKER_IMAGE}" ${DOCKER_EXECUTABLE} run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw${VOLUME_SUFFIX},delegated \