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 697f5f825..686770c86 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 705563c1c..d85611151 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 530143416..3e32c6dc6 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 d6ae49e43..8aa705d4a 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 605cb646a..a31c07d39 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 2a6f76da1..671ece63b 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 c403c42b7..371fcc399 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 62e80b720..fcbed4023 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 6489650f6..607c48678 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 c8b3f7b3f..159555de8 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 645df0a5c..cf174e7f6 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 f20bcab7b..f0bfe5bef 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/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml b/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml index ef1e4d9c5..f33223491 100644 --- a/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingno.yaml +++ b/.ci_support/linux_riscv64_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_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml b/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml index 383b2ba41..1a47917e2 100644 --- a/.ci_support/linux_riscv64_build_typedebugchannel_targetsconda-forge_python_debugfreethreadingyes.yaml +++ b/.ci_support/linux_riscv64_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_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml index 61a7f814a..1b2672f8a 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml +++ b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingno.yaml @@ -1,3 +1,5 @@ +DOCKER_PLATFORM: +- linux/amd64 build_type: - release bzip2: diff --git a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml b/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml index 0ae5df74d..1f07e7ce4 100644 --- a/.ci_support/linux_riscv64_build_typereleasechannel_targetsconda-forge_mainfreethreadingyes.yaml +++ b/.ci_support/linux_riscv64_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 \ diff --git a/README.md b/README.md index 634a775e3..d3440d56e 100644 --- a/README.md +++ b/README.md @@ -145,10 +145,10 @@ Current release info Installing python ================= -Installing `python` from the `conda-forge/label/python_debug` channel can be achieved by adding `conda-forge/label/python_debug` to your channels with: +Installing `python` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` -conda config --add channels conda-forge/label/python_debug +conda config --add channels conda-forge conda config --set channel_priority strict ``` @@ -194,7 +194,7 @@ It is possible to list all of the versions of `cpython` available on your platfo With conda ``` -conda search cpython --channel conda-forge/label/python_debug +conda search cpython --channel conda-forge ``` @@ -203,7 +203,7 @@ conda search cpython --channel conda-forge/label/python_debug With mamba ``` -mamba search cpython --channel conda-forge/label/python_debug +mamba search cpython --channel conda-forge ``` @@ -212,7 +212,7 @@ mamba search cpython --channel conda-forge/label/python_debug With pixi ``` -pixi search cpython --channel conda-forge/label/python_debug +pixi search cpython --channel conda-forge ``` @@ -222,13 +222,13 @@ pixi search cpython --channel conda-forge/label/python_debug ``` # Search all versions available on your platform: -mamba repoquery search cpython --channel conda-forge/label/python_debug +mamba repoquery search cpython --channel conda-forge # List packages depending on `cpython`: -mamba repoquery whoneeds cpython --channel conda-forge/label/python_debug +mamba repoquery whoneeds cpython --channel conda-forge # List dependencies of `cpython`: -mamba repoquery depends cpython --channel conda-forge/label/python_debug +mamba repoquery depends cpython --channel conda-forge ``` diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d8cdc28d8..d609f9501 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.14.9" %} +{% set version = "3.14.10" %} {% 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: e02d9ac21cebda6e46435369744a92c65cc7cd8669697694122cf97ffacd1e53 + sha256: de414a57119abef52784d8993e341d53aed635fc2b05c2607d9f98a2c5b72032 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 82924e798..260785fcb 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 5ddda8cb53bf9421f0a6bfe63f6a7093adb3b9c5 Mon Sep 17 00:00:00 2001 +From 705185e4ae1439cf45cc8987cb4337f5208788d3 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/26] 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 62a7500b5..04655d2be 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 8be93d494b557e9f611df3bfbd4a82641d971bb4 Mon Sep 17 00:00:00 2001 +From bbb703658d328605d415a367a73df8b5d495eb78 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/26] 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 6e959fe1f..aa0882b4d 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 fc10a54e60c90e67d3a9505c988f93093bb15e99 Mon Sep 17 00:00:00 2001 +From c6b9a31264b57e60dc9b7a8ff7f82f9a14dd7640 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/26] 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 92a8ddbac..e2e721abc 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 0e48656148eaffbb5366125538c8f0a87416da70 Mon Sep 17 00:00:00 2001 +From ee361028684b32b8f896f92e0f189febb6d2a2d1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS @@ -23,7 +23,7 @@ index ada8a27be4c..88252adf91d 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index ce9a40e7d48..fa2893b2716 100644 +index cf59ae35bba..e5e23d7c759 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ @@ -34,7 +34,7 @@ index ce9a40e7d48..fa2893b2716 100644 # ** Values calculated at runtime ** # config -- [in/out] dict of the PyConfig structure -@@ -701,7 +702,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -717,7 +718,7 @@ def search_up(prefix, *landmarks, test=isfile): else: pythonpath.append(joinpath(base_prefix, ZIP_LANDMARK)) diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index bc67d7ae0..d11d7c89a 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 821e068338e098471e786d1a2dae60872e16df95 Mon Sep 17 00:00:00 2001 +From cf126ff8afcc8df08e7554a02fcbe8fe07af4d21 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/26] Unvendor openssl diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 99a21641a..ea7db5848 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From a3f342664f1bb333bb10a3b7c2e8956c1a9f9595 Mon Sep 17 00:00:00 2001 +From 25dd40b4cbede6be956369d98413dfaaae928ef5 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/26] Unvendor sqlite3 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index b9643a641..29153d13c 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 7b884a9723d6445c0346a21ba97e48d8a3010796 Mon Sep 17 00:00:00 2001 +From 40cd7690213477fce140004b70a293364ccd4f1b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath() diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index bd4e5b846..1307bfd1a 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From e2cd422eca5af7cadf6ca922563dac3575403098 Mon Sep 17 00:00:00 2001 +From 29a470667bffa1f1bde1ec4af8131c3f41f6a8d4 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/26] Doing d1trimfile @@ -368,7 +368,7 @@ index f482734ba1d..70943daa021 100644 $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index ce21f992ff8..34561515c12 100644 +index 16595c782b3..95f45376e61 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -389,7 +389,7 @@ index ce21f992ff8..34561515c12 100644 + - + diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj index 4e721e8ce09..3fec7516ed5 100644 --- a/PCbuild/_testbuffer.vcxproj @@ -720,7 +720,7 @@ index 3f8772d30b4..d80968e351a 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 5099e44020e..b724db69bdd 100644 +index 43a26c05a2a..f311d156616 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 2c37dc07f..df39d6c71 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 5f46de1baa9972bb4c34e276f10eae9ca84a2868 Mon Sep 17 00:00:00 2001 +From 4573959b5379231d79ce9dd6f065645bef903fe0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/26] cross compile darwin @@ -29,7 +29,7 @@ index b017b841311..f7821ae7f28 100644 try: import plistlib diff --git a/configure b/configure -index 93339120cc4..1ea165c7c3b 100755 +index 2a4b6fc96cc..772857b4cae 100755 --- a/configure +++ b/configure @@ -4114,6 +4114,9 @@ then @@ -53,7 +53,7 @@ index 93339120cc4..1ea165c7c3b 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index 24089d0839e..d5501eed168 100644 +index f51935d8813..2ee3d5cc757 100644 --- a/configure.ac +++ b/configure.ac @@ -330,6 +330,9 @@ then diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index 6eac01494..1258c94c7 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From a0a92926fabedfee953fc03db6b7a4e1d22320e2 Mon Sep 17 00:00:00 2001 +From 1413df1472a51ab32d704fd8f5ff29c26c0048ba Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/26] 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 eeb4c598e..bdd3e0484 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 1038bfb69eaf6e4504a953ea15f38fd25a3439df Mon Sep 17 00:00:00 2001 +From 837ac3573cf0e257782dcb3d069a3d4202684ad4 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1 @@ -18,10 +18,10 @@ and this code using 10.16 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index 27b99211ce6..1c9a3a88da5 100644 +index 3956f504740..51fe8e907f4 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c -@@ -1510,7 +1510,7 @@ copy_com_pointer(PyObject *self, PyObject *args) +@@ -1515,7 +1515,7 @@ copy_com_pointer(PyObject *self, PyObject *args) #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH # ifdef HAVE_BUILTIN_AVAILABLE # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ @@ -30,7 +30,7 @@ index 27b99211ce6..1c9a3a88da5 100644 # else # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ (_dyld_shared_cache_contains_path != NULL) -@@ -1553,8 +1553,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar +@@ -1558,8 +1558,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar if (PyUnicode_FSConverter(name, &name2) == 0) return NULL; name_str = PyBytes_AS_STRING(name2); diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 3d454235b..56a62261b 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 582b006bd530deba7f5b5fc68bb97b4987d528ed Mon Sep 17 00:00:00 2001 +From 6796f0d5f6c0dc4661df2af52e7c58cc276d91e0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/26] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index c13051174..ea54f8798 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 2699314c413a55d0b801040cad0bac4ec5d47587 Mon Sep 17 00:00:00 2001 +From 586e25ac3962457340d187803205e688218780fe Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/26] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 32cbfe72c..e65e5c2c7 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From abb56989b070010c563b606936a139851053bc10 Mon Sep 17 00:00:00 2001 +From d78323b00546ff2daed802bc0710a8b6c5459dd9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/26] Unvendor tcltk diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index ef260280a..f0d78e28c 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 3c7326859ab12bebfbd57504a9c2b8cce6a737ce Mon Sep 17 00:00:00 2001 +From 35ea6e0ea76e9afd8fd327df4b7070b8c4556cd6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/26] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index edf2e5963..cc3b12a11 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 4cd5eddc2c56e5627cf7ab579588edbf0317497b Mon Sep 17 00:00:00 2001 +From 1d1c93a025e5dc2529b2118d0c615baec25e1064 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/26] unvendor zlib @@ -9,7 +9,7 @@ Subject: [PATCH 16/26] unvendor zlib 2 files changed, 4 insertions(+), 76 deletions(-) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index b724db69bdd..9472fda6e2f 100644 +index f311d156616..3e0db4fe0c7 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -41,7 +41,7 @@ index b724db69bdd..9472fda6e2f 100644 -@@ -684,12 +684,6 @@ +@@ -685,12 +685,6 @@ @@ -55,10 +55,10 @@ index b724db69bdd..9472fda6e2f 100644 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 0e6d42cc959..144a0e3425a 100644 +index 4e386fa878e..1f717812f68 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters -@@ -900,39 +900,6 @@ +@@ -903,39 +903,6 @@ Include\internal\mimalloc @@ -98,7 +98,7 @@ index 0e6d42cc959..144a0e3425a 100644 Include\internal -@@ -1580,39 +1547,6 @@ +@@ -1583,39 +1550,6 @@ Objects 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 30e1fa5cb..e2b753daa 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 070919737a60aaab4072389c3095f71165b0331f Mon Sep 17 00:00:00 2001 +From 3cc0587ccfc6a0083551499bd1b7483cc7f92d0b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/26] 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 1ea165c7c3b..208b9a26b39 100755 +index 772857b4cae..2cd1442f7cf 100755 --- a/configure +++ b/configure @@ -5803,9 +5803,9 @@ if test $ac_test_CFLAGS; then @@ -35,7 +35,7 @@ index 1ea165c7c3b..208b9a26b39 100755 ;; *) diff --git a/configure.ac b/configure.ac -index d5501eed168..bbbe6fbd055 100644 +index 2ee3d5cc757..d85cf7be8c7 100644 --- a/configure.ac +++ b/configure.ac @@ -2349,7 +2349,7 @@ then diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 226b9a442..8a79132dc 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From 195d06ab8dabf3c402b9a91d3fa5ff867fb23816 Mon Sep 17 00:00:00 2001 +From f3e6d6c8135552bd4de25849f43396121c7d0698 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/26] Unvendor expat diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 608100744..3b1a2dcea 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 104005bf2a5d4e962ea819ebe6d503ea1cd57a18 Mon Sep 17 00:00:00 2001 +From c514cdc3a738d6a809d5e2005237b0cb074bc33d Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/26] 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 7b3e508d819..e3a27b0eb17 100644 +index 1a508f5c41c..4b80e726c1c 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 4e8005740..927fc49e2 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 8cb94b484292b71b6f805b953b2f47c4ce3d886c Mon Sep 17 00:00:00 2001 +From 4324fe19dfb3a2cd371e5cac4ca1e1b388b1f634 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/26] Don't checksharedmods if cross-compiling @@ -10,10 +10,10 @@ Subject: [PATCH 20/26] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index e3a27b0eb17..00b0c187c1f 100644 +index 4b80e726c1c..83fab777904 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1608,7 +1608,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt +@@ -1609,7 +1609,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 af105c8ab..6b81d334e 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 4a18b8093c80664d0c7ec1407fb439f5087972bb Mon Sep 17 00:00:00 2001 +From c9ebb07b34a3804ba2bf874dc3127cb92c19cae9 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/26] Override configure LIBFFI @@ -8,15 +8,15 @@ Subject: [PATCH 21/26] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 208b9a26b39..bab15a6d3d2 100755 +index 2cd1442f7cf..20ebfa2ce56 100755 --- a/configure +++ b/configure -@@ -15431,7 +15431,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -15453,7 +15453,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes then : have_libffi=yes -- LIBFFI_CFLAGS="-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1" -+ LIBFFI_CFLAGS="-I${PREFIX}/include -DUSING_APPLE_OS_LIBFFI=0" - LIBFFI_LIBS="-lffi" +- LIBFFI_CFLAGS=${LIBFFI_CFLAGS-"-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1"} ++ LIBFFI_CFLAGS=${LIBFFI_CFLAGS-"-I${PREFIX}/include -DUSING_APPLE_OS_LIBFFI=0"} + LIBFFI_LIBS=${LIBFFI_LIBS-"-lffi"} fi diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index 5b694d581..22d5c2a69 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From 6bd4cd039da7158a254219d49cd62cd6b0815d8a Mon Sep 17 00:00:00 2001 +From 90570399f2c6ca5ada8033d59945b05ade0d8f1b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/26] Unvendor libmpdec diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index b5cf1a962..050e37541 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 29ffff5fdec876dd71adf7c9770459f4756075a2 Mon Sep 17 00:00:00 2001 +From 3a7c25a2a32f22501c07389fc5e3041f02ab7e2d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/26] 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 212e2cefc..589c3bdb0 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 481418c7aaf5045f6d0d77278a4cb2a95ac3d8b6 Mon Sep 17 00:00:00 2001 +From 0a00924f59de3cc09f5c7f6117b089c2d3f555de Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/26] Do not define pid_t as it might conflict with the diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch index 9736aae1e..2aae0b01c 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,4 +1,4 @@ -From e57084a2aaedccf761d49502740c6966ba61c5e5 Mon Sep 17 00:00:00 2001 +From c950dcd4a9c1a51da8e9ffc24836beae4e5ed104 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Jul 2025 18:07:54 +0200 Subject: [PATCH 25/26] Unvendor zstd @@ -195,9 +195,8 @@ index eec666e5eaf..5028bb5592d 100644 Header Files - -+ - Header Files\zstd - +- Header Files\zstd +- - - Header Files\zstd - @@ -259,8 +258,9 @@ index eec666e5eaf..5028bb5592d 100644 - Header Files\zstd - - -- Header Files\zstd -- ++ + Header Files\zstd + - + Header Files\zstd diff --git a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch index 304827cb5..e79039b8a 100644 --- a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch +++ b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch @@ -1,4 +1,4 @@ -From b433984fd9fb7df8b367f4b5529eba81e99ae573 Mon Sep 17 00:00:00 2001 +From 2b7f0437483826607f218d8ed32e9ba1239c1e7e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 2 Dec 2025 09:46:56 -0800 Subject: [PATCH 26/26] Set Py_GIL_DISABLED in windows to match unix