diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 956c664d..76221e89 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_build_typedebugchannel_targetsconda-forge_python_debug: 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 cec41987..c29363c0 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 @@ -56,4 +56,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' 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 aff5eb7b..e36dd35f 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -56,4 +56,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' 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 26ae02c9..f8c064ec 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 @@ -60,4 +60,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' 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 eecc55dd..116d25a4 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -60,4 +60,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' 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 e63b23a0..663fa252 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 @@ -54,4 +54,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' 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 3e6f844c..8b77b890 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml @@ -54,4 +54,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' 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 59e53b9d..ab3f07f7 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 @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: - '11.0' build_type: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -54,4 +54,4 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' 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 b43a69c6..614f0f48 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: - '11.0' build_type: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -54,4 +54,4 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' 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 58e4fd91..6bc8d62b 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 @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_type: - debug bzip2: @@ -52,4 +54,4 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' 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 25adde9f..3796ea1e 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' build_type: - release bzip2: @@ -52,4 +54,4 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 56e65c06..ea1efabe 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -6,8 +6,6 @@ c_compiler: - vs2019 c_stdlib: - vs -c_stdlib_version: -- '2019' channel_sources: - conda-forge channel_targets: @@ -38,4 +36,4 @@ zip_keys: - - build_type - channel_targets zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index cdcc40ba..07d926d8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,6 +80,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d062920d..2e644779 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 42e41b07..7a6d8abd 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/.travis.yml b/.travis.yml index 5e5467b6..31daf299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -language: generic +language: shell -matrix: +jobs: include: - env: CONFIG=linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux diff --git a/README.md b/README.md index 341929dc..758d0244 100644 --- a/README.md +++ b/README.md @@ -141,14 +141,14 @@ 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 ``` -Once the `conda-forge/label/python_debug` channel has been enabled, `libpython-static, python` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libpython-static, python` can be installed with `conda`: ``` conda install libpython-static python @@ -163,26 +163,26 @@ mamba install libpython-static python It is possible to list all of the versions of `libpython-static` available on your platform with `conda`: ``` -conda search libpython-static --channel conda-forge/label/python_debug +conda search libpython-static --channel conda-forge ``` or with `mamba`: ``` -mamba search libpython-static --channel conda-forge/label/python_debug +mamba search libpython-static --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libpython-static --channel conda-forge/label/python_debug +mamba repoquery search libpython-static --channel conda-forge # List packages depending on `libpython-static`: -mamba repoquery whoneeds libpython-static --channel conda-forge/label/python_debug +mamba repoquery whoneeds libpython-static --channel conda-forge # List dependencies of `libpython-static`: -mamba repoquery depends libpython-static --channel conda-forge/label/python_debug +mamba repoquery depends libpython-static --channel conda-forge ``` diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad70120c..fe32deb3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.12.3" %} +{% set version = "3.12.4" %} {% 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: 8defb33f0c37aa4bdd3a38ba52abde4e + md5: d68f25193eec491eb54bc2ea664a05bd {% 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 0e4c9175..b0aefe51 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 656d027af328edb2cc196eec7e726fa62e2ce3f2 Mon Sep 17 00:00:00 2001 +From 4f915b76bf52d9a4a355e0047b0ac8d66a8ec336 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 diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index 9e03b280..e9ca11c7 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 74d8297f1fb827e069ba795a00dd5cd40cd01a49 Mon Sep 17 00:00:00 2001 +From 89ac50838fc3c43b63342d7b9c434fe68e11d678 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 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 70818101..89ad52da 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 6acef4cee4f5107be46225f159cf5a5238f2c6bd Mon Sep 17 00:00:00 2001 +From 1add97729db66a572b0ad8f26186071c6d1b19fd 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 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 319edbfa..98b125fa 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 842497c29a668817928af9ab966b2a63bfbcd294 Mon Sep 17 00:00:00 2001 +From 4c0b20c3cebfcb8eaa0406c7b626322d01087492 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 diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 2fc0c343..11c73027 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 4fd9f886ff5b07c0ff51a767b147f5154e685686 Mon Sep 17 00:00:00 2001 +From 91c6890e658e06e72213b8699e9c7e15ab42de55 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 @@ -144,7 +144,7 @@ index 0da6f67495..17eee400eb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index d85fe4ab2a..cf0913f331 100644 +index d799948fa3..cf0913f331 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -61,6 +61,7 @@ @@ -159,7 +159,7 @@ index d85fe4ab2a..cf0913f331 100644 -- $(ExternalsDir)sqlite-3.45.1.0\ +- $(ExternalsDir)sqlite-3.45.3.0\ - $(ExternalsDir)bzip2-1.0.8\ - $(ExternalsDir)xz-5.2.5\ - $(ExternalsDir)libffi-3.4.4\ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 6f653780..13ca0de7 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 4437c580909034fa0e660b38cfca148bb0345f1d Mon Sep 17 00:00:00 2001 +From 0a0c280aec453af0a3904a696dfc71175e6dc246 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 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index d6d8cfd9..2df35886 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From a588758d0e8935f6506e0fc9ce96ad016b918534 Mon Sep 17 00:00:00 2001 +From 46d9b400457bec18d25f3977758daa76d53acbf4 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 a0130fde15..e690dcf7df 100644 +index 2c36527a87..84cbae8248 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 e0d5f04d..8b012444 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 9f20e0ac40b761542197d65d4e188c474d42ea2b Mon Sep 17 00:00:00 2001 +From 679e1d26a2d1883952ef98d191cc08242adcab12 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 @@ -418,7 +418,7 @@ index 917d7ae50f..8c7e141eea 100644 diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index e032e67c25..288f68ee9d 100644 +index 257562c75d..41bd3cc56c 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 84a2a0b3..2ef8f8c0 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From edb3ba3037493e6f18c6663577bbe2ed6828f8fa Mon Sep 17 00:00:00 2001 +From fae08eb999d62039e0dbbeb65761f0e4c507c471 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,10 +11,10 @@ By Isuru Fernando. 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py -index 7bb222088d..0b1cbc98e2 100755 +index c5b6048036..7470545466 100755 --- a/Lib/platform.py +++ b/Lib/platform.py -@@ -458,7 +458,12 @@ def win32_ver(release='', version='', csd='', ptype=''): +@@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''): def _mac_ver_xml(): fn = '/System/Library/CoreServices/SystemVersion.plist' if not os.path.exists(fn): @@ -29,7 +29,7 @@ index 7bb222088d..0b1cbc98e2 100755 try: import plistlib diff --git a/configure b/configure -index be783faa24..4a3f0b6302 100755 +index 6dc8a66e48..552597c021 100755 --- a/configure +++ b/configure @@ -4267,6 +4267,9 @@ then @@ -53,7 +53,7 @@ index be783faa24..4a3f0b6302 100755 _host_cpu= ;; diff --git a/configure.ac b/configure.ac -index 8be26cc0ab..058f1d1096 100644 +index 8a32cb58f4..36b565af1b 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 d5020fc5..1020b857 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 021e22856ef3ef90a67b0d18d4678752a7ee0ad6 Mon Sep 17 00:00:00 2001 +From eaf0b19149ec28a231e0c73e36b2a6fdc29c250e 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 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 e428d032..8fafc58d 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 7ab332db570ac958bbd29d1fc509c56679a726c5 Mon Sep 17 00:00:00 2001 +From dfa56fb035e286513a96ab1ee60a438a61295aac 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 diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index c45803bd..23f0716d 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 08b3753e59a304836dc3c942f0f094da62792726 Mon Sep 17 00:00:00 2001 +From 4cfee77c16d2985f27f61ed831027f18ad51a641 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 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 86d116f1..3b921e6f 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 65a0baff5337e62ec767c7325e1dff3d0befdc74 Mon Sep 17 00:00:00 2001 +From a346f51234b70e907c8bac4156e2f67f209ca380 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 diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index a505833c..ae34ec8a 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,4 +1,4 @@ -From 5c86ea7b1b6d1b8b80c8832d7419b34bbaf784dd Mon Sep 17 00:00:00 2001 +From dcb96fc3a6604875421ad94654bad12424db494c 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 diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index a4a1952c..bbb3882a 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From aac43cc3683c7e2883193c5c961ff663ca26b0d6 Mon Sep 17 00:00:00 2001 +From e2ef6df310bc7877332881ac140aab4d884a887e 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 diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index ee9ae78d..d96dc979 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 50d8263428889fb632fca91f23404af3ea153ab2 Mon Sep 17 00:00:00 2001 +From 91fcbab935cefba1855808e5b275d2b81b79d53a 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 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 7de74643..266edb53 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 17ae3c508328f717f06f10a59ba4ce95326a45f8 Mon Sep 17 00:00:00 2001 +From 7c7ce51dae3af7b8325e1ccdf8bcd7225b2b5065 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 4a3f0b6302..074830a032 100755 +index 552597c021..cff40b9959 100755 --- a/configure +++ b/configure @@ -5465,9 +5465,9 @@ if test $ac_test_CFLAGS; then @@ -35,10 +35,10 @@ index 4a3f0b6302..074830a032 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 058f1d1096..33dfd41aa9 100644 +index 36b565af1b..538122985c 100644 --- a/configure.ac +++ b/configure.ac -@@ -2247,7 +2247,7 @@ then +@@ -2255,7 +2255,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index b06ffcb9..60dde921 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From c73635e11f1e462a1d65eb292403bf198fa59964 Mon Sep 17 00:00:00 2001 +From 578d46ad1930ab405cd908d8ec68368db36f0801 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 diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 980daf74..19a4e882 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From cc5d7859a1961524c528a68983b461bdac7e9254 Mon Sep 17 00:00:00 2001 +From fd9f5630ec6e354261274f5cb79501024197f3a1 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 27a26c2252..df08b7461a 100644 +index 4a957fb004..689ece9d24 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 bc17bff5..450beeac 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 c0c767d515e1cf5724a3d13804e41860d0ddc996 Mon Sep 17 00:00:00 2001 +From 46ed1d097913ea6752125324ecf254a51e4927b4 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 @@ -10,10 +10,10 @@ Subject: [PATCH 20/22] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index df08b7461a..d3e0878335 100644 +index 689ece9d24..913cbd8e23 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -992,7 +992,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt +@@ -994,7 +994,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 b38ffbe0..5934acc0 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 375e7bd98df476410a670b4168c2cd6b37caf31d Mon Sep 17 00:00:00 2001 +From 9278cac7fd97574e551bf989795d61381131ac97 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 074830a032..09a90faf58 100755 +index cff40b9959..50cbcc1ac7 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 263af0b5..8b087e7b 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 8d4663b64a97de15c6c252a51fa1047526e1b66d Mon Sep 17 00:00:00 2001 +From bbc64a8ca9d69dbfd220a3924a71f7ea12cd43da 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 09a90faf58..9950b03e50 100755 +index 50cbcc1ac7..0108f553bf 100755 --- a/configure +++ b/configure @@ -25714,7 +25714,6 @@ fi @@ -46,10 +46,10 @@ index 09a90faf58..9950b03e50 100755 if test "x$have_curses" = xncurses then : diff --git a/configure.ac b/configure.ac -index 33dfd41aa9..8b87deac81 100644 +index 538122985c..284c0daddd 100644 --- a/configure.ac +++ b/configure.ac -@@ -6424,8 +6424,6 @@ AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.]) +@@ -6432,8 +6432,6 @@ AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.]) AC_CHECK_HEADERS([curses.h ncurses.h]) AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [ @@ -58,7 +58,7 @@ index 33dfd41aa9..8b87deac81 100644 PKG_CHECK_MODULES([CURSES], [ncursesw], [ AC_DEFINE([HAVE_NCURSESW], [1]) have_curses=ncursesw -@@ -6439,7 +6437,6 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [ +@@ -6447,7 +6445,6 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [ ]) ]) ]) @@ -66,7 +66,7 @@ index 33dfd41aa9..8b87deac81 100644 AS_VAR_IF([have_curses], [no], [ PKG_CHECK_MODULES([CURSES], [ncurses], [ -@@ -6488,8 +6485,6 @@ AC_CHECK_HEADERS([panel.h]) +@@ -6496,8 +6493,6 @@ AC_CHECK_HEADERS([panel.h]) AS_VAR_IF([ac_cv_header_panel_h], [yes], [ @@ -75,7 +75,7 @@ index 33dfd41aa9..8b87deac81 100644 AS_VAR_IF([have_curses], [ncursesw], [ PKG_CHECK_MODULES([PANEL], [panelw], [ have_panel=panelw -@@ -6503,7 +6498,6 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [ +@@ -6511,7 +6506,6 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [ ]) ]) ])