From 72cc470690bcd4c8a3705c2df23f899052db4d7c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 23 Sep 2021 16:18:42 +0000 Subject: [PATCH 1/5] Rebuild for openssl3 --- .ci_support/migrations/openssl3.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/openssl3.yaml diff --git a/.ci_support/migrations/openssl3.yaml b/.ci_support/migrations/openssl3.yaml new file mode 100644 index 000000000..ae551c1e9 --- /dev/null +++ b/.ci_support/migrations/openssl3.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1631932209.13688 +openssl: +- 1.1.1 +- '3' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4583f8ae7..d64c26a3f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 2 %} +{% set build_number = 3 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} From f2e6ee30da6fe354393765eb090059b87f83269e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 23 Sep 2021 16:19:15 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.23.07.33.37 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++- .azure-pipelines/azure-pipelines-osx.yml | 14 ++-- .azure-pipelines/azure-pipelines-win.yml | 7 +- ...ux_64_.yaml => linux_64_openssl1.1.1.yaml} | 2 - .ci_support/linux_64_openssl3.yaml | 63 ++++++++++++++++++ ..._.yaml => linux_aarch64_openssl1.1.1.yaml} | 2 - .ci_support/linux_aarch64_openssl3.yaml | 65 ++++++++++++++++++ ..._.yaml => linux_ppc64le_openssl1.1.1.yaml} | 2 - .ci_support/linux_ppc64le_openssl3.yaml | 57 ++++++++++++++++ ...{osx_64_.yaml => osx_64_openssl1.1.1.yaml} | 2 - .ci_support/osx_64_openssl3.yaml | 63 ++++++++++++++++++ ...rm64_.yaml => osx_arm64_openssl1.1.1.yaml} | 2 - .ci_support/osx_arm64_openssl3.yaml | 57 ++++++++++++++++ ...{win_64_.yaml => win_64_openssl1.1.1.yaml} | 2 - .ci_support/win_64_openssl3.yaml | 22 +++++++ .drone.yml | 35 +++++++++- .travis.yml | 7 +- README.md | 66 +++++++++++++++---- 18 files changed, 441 insertions(+), 35 deletions(-) rename .ci_support/{linux_64_.yaml => linux_64_openssl1.1.1.yaml} (96%) create mode 100644 .ci_support/linux_64_openssl3.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_openssl1.1.1.yaml} (96%) create mode 100644 .ci_support/linux_aarch64_openssl3.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_openssl1.1.1.yaml} (95%) create mode 100644 .ci_support/linux_ppc64le_openssl3.yaml rename .ci_support/{osx_64_.yaml => osx_64_openssl1.1.1.yaml} (96%) create mode 100644 .ci_support/osx_64_openssl3.yaml rename .ci_support/{osx_arm64_.yaml => osx_arm64_openssl1.1.1.yaml} (95%) create mode 100644 .ci_support/osx_arm64_openssl3.yaml rename .ci_support/{win_64_.yaml => win_64_openssl1.1.1.yaml} (90%) create mode 100644 .ci_support/win_64_openssl3.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f04e699cd..d36fc0246 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_openssl1.1.1: + CONFIG: linux_64_openssl1.1.1 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_openssl3: + CONFIG: linux_64_openssl3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 39baad3f4..73640f360 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,17 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_openssl1.1.1: + CONFIG: osx_64_openssl1.1.1 UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_64_openssl3: + CONFIG: osx_64_openssl3 + UPLOAD_PACKAGES: 'True' + osx_arm64_openssl1.1.1: + CONFIG: osx_arm64_openssl1.1.1 + UPLOAD_PACKAGES: 'True' + osx_arm64_openssl3: + CONFIG: osx_arm64_openssl3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 117b3378c..2269abbfe 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,11 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_openssl1.1.1: + CONFIG: win_64_openssl1.1.1 + UPLOAD_PACKAGES: 'True' + win_64_openssl3: + CONFIG: win_64_openssl3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_openssl1.1.1.yaml similarity index 96% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_openssl1.1.1.yaml index a49742df4..d66b229e9 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -29,8 +29,6 @@ pin_run_as_build: max_pin: x.x ncurses: max_pin: x.x - openssl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml new file mode 100644 index 000000000..c1bd509b1 --- /dev/null +++ b/.ci_support/linux_64_openssl3.yaml @@ -0,0 +1,63 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +libffi: +- '3.4' +ncurses: +- '6.2' +openssl: +- '3' +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + readline: + max_pin: x + sqlite: + max_pin: x + tk: + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- '3.9' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-64 +tk: +- '8.6' +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml similarity index 96% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_openssl1.1.1.yaml index 7fd6680b8..587cfa788 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -33,8 +33,6 @@ pin_run_as_build: max_pin: x.x ncurses: max_pin: x.x - openssl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml new file mode 100644 index 000000000..d6ef5db14 --- /dev/null +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -0,0 +1,65 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +libffi: +- '3.4' +ncurses: +- '6.2' +openssl: +- '3' +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + readline: + max_pin: x + sqlite: + max_pin: x + tk: + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- '3.9' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml similarity index 95% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_openssl1.1.1.yaml index e160a6f38..5828e0822 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -29,8 +29,6 @@ pin_run_as_build: max_pin: x.x ncurses: max_pin: x.x - openssl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml new file mode 100644 index 000000000..4c6c03e4c --- /dev/null +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -0,0 +1,57 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos7 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +libffi: +- '3.4' +ncurses: +- '6.2' +openssl: +- '3' +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + readline: + max_pin: x + sqlite: + max_pin: x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- '3.9' +readline: +- '8' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_openssl1.1.1.yaml similarity index 96% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_openssl1.1.1.yaml index 10751c850..f440f1b51 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -31,8 +31,6 @@ pin_run_as_build: max_pin: x.x ncurses: max_pin: x.x - openssl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml new file mode 100644 index 000000000..d973595de --- /dev/null +++ b/.ci_support/osx_64_openssl3.yaml @@ -0,0 +1,63 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: +- '11.0' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +libffi: +- '3.4' +macos_machine: +- x86_64-apple-darwin13.4.0 +ncurses: +- '6.2' +openssl: +- '3' +pin_run_as_build: + bzip2: + max_pin: x + libffi: + max_pin: x.x + ncurses: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + readline: + max_pin: x + sqlite: + max_pin: x + tk: + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- '3.9' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-64 +tk: +- '8.6' +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_openssl1.1.1.yaml similarity index 95% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_openssl1.1.1.yaml index 0e351d315..803fa4f03 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1.yaml @@ -25,8 +25,6 @@ pin_run_as_build: max_pin: x ncurses: max_pin: x.x - openssl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_arm64_openssl3.yaml b/.ci_support/osx_arm64_openssl3.yaml new file mode 100644 index 000000000..46477e464 --- /dev/null +++ b/.ci_support/osx_arm64_openssl3.yaml @@ -0,0 +1,57 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +macos_machine: +- arm64-apple-darwin20.0.0 +ncurses: +- '6.2' +openssl: +- '3' +pin_run_as_build: + bzip2: + max_pin: x + ncurses: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + readline: + max_pin: x + sqlite: + max_pin: x + tk: + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- '3.9' +readline: +- '8' +sqlite: +- '3' +target_platform: +- osx-arm64 +tk: +- '8.6' +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_openssl1.1.1.yaml similarity index 90% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_openssl1.1.1.yaml index 7113321cb..c6dd1f99e 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_openssl1.1.1.yaml @@ -9,8 +9,6 @@ cxx_compiler: openssl: - 1.1.1 pin_run_as_build: - openssl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/win_64_openssl3.yaml b/.ci_support/win_64_openssl3.yaml new file mode 100644 index 000000000..6f89e7459 --- /dev/null +++ b/.ci_support/win_64_openssl3.yaml @@ -0,0 +1,22 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x + sqlite: + max_pin: x +python: +- '3.9' +sqlite: +- '3' +target_platform: +- win-64 diff --git a/.drone.yml b/.drone.yml index af150917c..e9f1f1ea9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_ +name: linux_aarch64_openssl1.1.1 platform: os: linux @@ -10,7 +10,38 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_ + CONFIG: linux_aarch64_openssl1.1.1 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + FEEDSTOCK_TOKEN: + from_secret: FEEDSTOCK_TOKEN + STAGING_BINSTAR_TOKEN: + from_secret: STAGING_BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh + - echo "Done building" + +--- +kind: pipeline +name: linux_aarch64_openssl3 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: quay.io/condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_openssl3 UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.travis.yml b/.travis.yml index ecb962dea..cdd507356 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,12 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal diff --git a/README.md b/README.md index ecf206579..3a4b75c65 100644 --- a/README.md +++ b/README.md @@ -53,45 +53,87 @@ Current build status - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + From ab5e9b962e51791294136e27c5ae140ae524f981 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 25 Sep 2021 21:28:27 +0200 Subject: [PATCH 3/5] Require cmake>=3.10 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d64c26a3f..9b6f4643a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -222,7 +222,7 @@ outputs: - setuptools requires: - ripgrep - - cmake + - cmake >=3.10 - ninja - {{ compiler('c') }} # Tried to use enable_language(C) to avoid needing this. It does not work. From f43e03141a8c90357aeb6e2d4fd988aa8f18bdbb Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 28 Sep 2021 12:57:15 +0200 Subject: [PATCH 4/5] Fix library name when linking against OpenSSL 3.x on windows --- recipe/meta.yaml | 1 + recipe/patches/0035-set-ssltag-to-3.patch | 33 +++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipe/patches/0035-set-ssltag-to-3.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9b6f4643a..5c48fde66 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,6 +78,7 @@ source: - patches/0032-Fix-TZPATH-on-windows.patch - patches/0033-gh24324.patch - patches/0034-distutils-fix-ldshared.patch + - patches/0035-set-ssltag-to-3.patch # [openssl != '1.1.1'] # TODO :: Depend on our own packages for these: - url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip # [win] diff --git a/recipe/patches/0035-set-ssltag-to-3.patch b/recipe/patches/0035-set-ssltag-to-3.patch new file mode 100644 index 000000000..f5401cd6d --- /dev/null +++ b/recipe/patches/0035-set-ssltag-to-3.patch @@ -0,0 +1,33 @@ +From bd7adc3ebd5e6bdf6d7f7fe38e06bf4f17d2168f Mon Sep 17 00:00:00 2001 +From: Chris Burr +Date: Tue, 28 Sep 2021 12:40:44 +0200 +Subject: [PATCH] Set ssltag to 3 + +--- + Tools/msi/msi.props | 2 +- + PCbuild/openssl.props | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props +--- a/Tools/msi/msi.props 2021-09-28 13:28:28.000000000 +0200 ++++ b/Tools/msi/msi.props 2021-09-28 13:27:51.000000000 +0200 +@@ -88,7 +88,7 @@ + PyArchExt=$(PyArchExt); + PyTestExt=$(PyTestExt); + OptionalFeatureName=$(OutputName); +- ssltag=-1_1; ++ ssltag=-3; + + + $(DefineConstants);CRTRedist=$(CRTRedist); +--- a/PCbuild/openssl.props 2021-09-28 13:57:44.000000000 +0200 ++++ b/PCbuild/openssl.props 2021-09-28 13:58:49.000000000 +0200 +@@ -10,7 +10,7 @@ + + + +- <_DLLSuffix>-1_1 ++ <_DLLSuffix>-3 + <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 + From 63e4dd7bdf519efaf23d77a67b21676755be1667 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 29 Sep 2021 12:52:09 +1100 Subject: [PATCH 5/5] fix patches & line endings --- recipe/meta.yaml | 9 +- ...arch-x86_64-to-UnicCCompiler-ld_args.patch | 12 +-- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 6 +- ...Add-support-to-cygwinccompiler-for-V.patch | 6 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 16 ++-- ...05-Support-cross-compiling-byte-code.patch | 10 +-- ...Windows-GCC-interop-needed-by-RPy2-a.patch | 6 +- ...ysroot-usr-lib-include-if-sysroot-is.patch | 10 +-- ...dir_option-Use-1st-word-of-CC-as-com.patch | 10 +-- ...0009-Win32-Do-not-download-externals.patch | 8 +- ..._CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch | 12 +-- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 12 +-- ...isable-new-dtags-in-unixccompiler.py.patch | 10 +-- ...-compilation-on-Debian-based-distros.patch | 10 +-- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 6 +- recipe/patches/0015-Unvendor-openssl.patch | 90 +++++++++---------- recipe/patches/0016-Unvendor-sqlite3.patch | 12 +-- ...ange-from-https-github.com-python-cp.patch | 6 +- ...-DLLSuffix-used-to-find-the-openssl-.patch | 6 +- ...nlib-from-env-if-env-variable-is-set.patch | 6 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 14 +-- ...RC_DIR-to-make-pdbs-more-relocatable.patch | 6 +- recipe/patches/0022-Doing-d1trimfile.patch | 6 +- ...-debugging-with-Windows-debug-builds.patch | 6 +- ...ARCH_MODIFICATION_KEEP_GIL-to-aid-de.patch | 16 ++-- .../patches/0025-cross-compile-darwin.patch | 26 +++--- ...patch => 0026-Fix-TZPATH-on-windows.patch} | 10 +-- ...h-work-with-SYSTEM_VERSION_COMPAT-1.patch} | 6 +- ...hared-overriding-when-a-compiler-is.patch} | 15 +++- ...-to-3.patch => 0029-Set-ssltag-to-3.patch} | 38 ++++---- 30 files changed, 213 insertions(+), 193 deletions(-) rename recipe/patches/{0032-Fix-TZPATH-on-windows.patch => 0026-Fix-TZPATH-on-windows.patch} (73%) rename recipe/patches/{0033-gh24324.patch => 0027-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch} (89%) rename recipe/patches/{0034-distutils-fix-ldshared.patch => 0028-Fix-distutils-ldshared-overriding-when-a-compiler-is.patch} (64%) rename recipe/patches/{0035-set-ssltag-to-3.patch => 0029-Set-ssltag-to-3.patch} (66%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5c48fde66..ef33523e7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,10 +75,11 @@ source: - patches/0023-egg-debugging-with-Windows-debug-builds.patch - patches/0024-Add-CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL-to-aid-de.patch - patches/0025-cross-compile-darwin.patch - - patches/0032-Fix-TZPATH-on-windows.patch - - patches/0033-gh24324.patch - - patches/0034-distutils-fix-ldshared.patch - - patches/0035-set-ssltag-to-3.patch # [openssl != '1.1.1'] + - patches/0026-Fix-TZPATH-on-windows.patch + # see python/cpython#24324 + - patches/0027-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch + - patches/0028-Fix-distutils-ldshared-overriding-when-a-compiler-is.patch + - patches/0029-Set-ssltag-to-3.patch # [openssl != '1.1.1'] # TODO :: Depend on our own packages for these: - url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip # [win] diff --git a/recipe/patches/0001-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch b/recipe/patches/0001-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch index 5f4d8b80c..5a7fd55ef 100644 --- a/recipe/patches/0001-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch +++ b/recipe/patches/0001-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch @@ -1,14 +1,14 @@ -From 0fcc174b9cef0d93ebf1c95fd942c1368132cfdc Mon Sep 17 00:00:00 2001 +From eea9f37827228df7afcb7ad11eb3e60cdd2a7ae4 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 08:48:16 +0100 -Subject: [PATCH 02/22] Darwin: Add -arch x86_64 to UnicCCompiler ld_args +Subject: [PATCH 01/29] Darwin: Add -arch x86_64 to UnicCCompiler ld_args --- - Lib/distutils/unixccompiler.py | 1 + - 1 file changed, 1 insertion(+) + Lib/distutils/unixccompiler.py | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 4d7a6de..3f05cf7 100644 +index f0792de74a..07778c3474 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -200,6 +200,8 @@ class UnixCCompiler(CCompiler): @@ -21,5 +21,5 @@ index 4d7a6de..3f05cf7 100644 self.spawn(linker + ld_args) except DistutilsExecError as msg: -- -2.20.1 +2.32.0.windows.2 diff --git a/recipe/patches/0002-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0002-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 148843bc8..884e5cf81 100644 --- a/recipe/patches/0002-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0002-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,7 +1,7 @@ -From d637f41485e2e8e0b09ba241d664f2bda765c62c Mon Sep 17 00:00:00 2001 +From e6b93399fa9e1315997badaf86630f2ff2cf66e9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 02/30] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 02/29] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- @@ -22,5 +22,5 @@ index fb71e9196f..57a5c29bb3 100644 #if defined(HAVE_POLL_H) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0003-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0003-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch index e0c8a10b4..5d9d468c6 100644 --- a/recipe/patches/0003-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch +++ b/recipe/patches/0003-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch @@ -1,7 +1,7 @@ -From d11ba2d6dbd21931bcc9233a0b553a56781917cf Mon Sep 17 00:00:00 2001 +From 665e02ec2744d3d375dae38a3948d710a2d7d7c2 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:59:00 +0100 -Subject: [PATCH 03/30] Win32: distutils: Add support to cygwinccompiler for +Subject: [PATCH 03/29] Win32: distutils: Add support to cygwinccompiler for VS>=2015 Really this is for mingw-w64 though @@ -24,5 +24,5 @@ index 66c12dd358..e6c790118b 100644 raise ValueError("Unknown MS Compiler version %s " % msc_ver) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0004-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0004-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index b1b848a33..8f3e3f085 100644 --- a/recipe/patches/0004-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0004-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,7 +1,7 @@ -From 583b390991261cf651032b7144d3054befd22d81 Mon Sep 17 00:00:00 2001 +From 2dc857c345371024d245b7f2aef619687269afda Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 04/30] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 04/29] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- @@ -10,10 +10,10 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 9e6fd46583..ac5cc21dcc 100755 +index ffa61c1dc5..461c7e845e 100755 --- a/configure +++ b/configure -@@ -4261,9 +4261,9 @@ if test "$ac_test_CFLAGS" = set; then +@@ -4264,9 +4264,9 @@ if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -25,7 +25,7 @@ index 9e6fd46583..ac5cc21dcc 100755 fi else if test "$GCC" = yes; then -@@ -6930,7 +6930,7 @@ then +@@ -6936,7 +6936,7 @@ then OPT="-g -O0 -Wall" fi else @@ -35,10 +35,10 @@ index 9e6fd46583..ac5cc21dcc 100755 ;; *) diff --git a/configure.ac b/configure.ac -index d60f05251a..a8135f1d8e 100644 +index 8fe5fa5742..69eedef82a 100644 --- a/configure.ac +++ b/configure.ac -@@ -1563,7 +1563,7 @@ then +@@ -1575,7 +1575,7 @@ then OPT="-g -O0 -Wall" fi else @@ -48,5 +48,5 @@ index d60f05251a..a8135f1d8e 100644 ;; *) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0005-Support-cross-compiling-byte-code.patch b/recipe/patches/0005-Support-cross-compiling-byte-code.patch index 9cc4c5338..18c68fa7b 100644 --- a/recipe/patches/0005-Support-cross-compiling-byte-code.patch +++ b/recipe/patches/0005-Support-cross-compiling-byte-code.patch @@ -1,7 +1,7 @@ -From ee0faacf1f8c46e331e537ca1c5eded2fc0b9783 Mon Sep 17 00:00:00 2001 +From 7a85707da1e922dea82d2dfe34fe632dd91ab7dc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:17:33 +0100 -Subject: [PATCH 05/30] Support cross-compiling byte-code +Subject: [PATCH 05/29] Support cross-compiling byte-code https://bugs.python.org/issue22724 --- @@ -77,7 +77,7 @@ index 6ce7a614dc..04bd829b7c 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure b/configure -index ffa61c1dc5..f4f5f09e9a 100755 +index 461c7e845e..45db05e75d 100755 --- a/configure +++ b/configure @@ -755,6 +755,7 @@ CONFIG_ARGS @@ -99,7 +99,7 @@ index ffa61c1dc5..f4f5f09e9a 100755 elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 diff --git a/configure.ac b/configure.ac -index 8fe5fa5742..ad88ce8b83 100644 +index 69eedef82a..5bd95d4797 100644 --- a/configure.ac +++ b/configure.ac @@ -82,13 +82,15 @@ if test "$cross_compiling" = yes; then @@ -120,5 +120,5 @@ index 8fe5fa5742..ad88ce8b83 100644 dnl Ensure that if prefix is specified, it does not end in a slash. If -- -2.33.0 +2.32.0.windows.2 diff --git a/recipe/patches/0006-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch b/recipe/patches/0006-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch index 2007bc203..1efbcbe99 100644 --- a/recipe/patches/0006-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch +++ b/recipe/patches/0006-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch @@ -1,7 +1,7 @@ -From 4c935f04b47027b4cc15b7bb899e03eab41d34bf Mon Sep 17 00:00:00 2001 +From a5ff90e9723ed78a63c8c40384efd4e0de869f8b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:23:02 +0100 -Subject: [PATCH 06/30] Win32: Fixes for Windows GCC interop needed by RPy2 and +Subject: [PATCH 06/29] Win32: Fixes for Windows GCC interop needed by RPy2 and CVXOPT We must pass -DMS_WIN32 or -DMS_WIN64 @@ -31,5 +31,5 @@ index e6c790118b..d4337669e3 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0007-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch b/recipe/patches/0007-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch index cfeeb14ca..d60879c32 100644 --- a/recipe/patches/0007-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch +++ b/recipe/patches/0007-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch @@ -1,7 +1,7 @@ -From fee618d990e4d7effcec92085d2fdcf414a933a8 Mon Sep 17 00:00:00 2001 +From 317b8a8d47ecc2d0eabecb975e0ae7bf345eccc4 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 20 Aug 2017 00:22:22 +0100 -Subject: [PATCH 07/30] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot +Subject: [PATCH 07/29] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot is set --- @@ -9,10 +9,10 @@ Subject: [PATCH 07/30] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 770866bca7..41cd6e171c 100644 +index 54d4b942bd..0489b616f9 100644 --- a/setup.py +++ b/setup.py -@@ -770,7 +770,13 @@ class PyBuildExt(build_ext): +@@ -758,7 +758,13 @@ class PyBuildExt(build_ext): # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. @@ -28,5 +28,5 @@ index 770866bca7..41cd6e171c 100644 self.inc_dirs = self.compiler.include_dirs + system_include_dirs else: -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0008-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0008-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch index 2cf82e986..4f432ed97 100644 --- a/recipe/patches/0008-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch +++ b/recipe/patches/0008-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch @@ -1,7 +1,7 @@ -From d931b85e44bb5f2aff68f1504ff1aeca76b8f56c Mon Sep 17 00:00:00 2001 +From 7ad0dc480d7fecb1ae730fd1f3dffb7f769efc14 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 5 Oct 2017 02:00:41 +0100 -Subject: [PATCH 08/30] runtime_library_dir_option: Use 1st word of CC as +Subject: [PATCH 08/29] runtime_library_dir_option: Use 1st word of CC as compiler Previous, 'CC' got passed to os.path.basename, so any paths in it after @@ -12,10 +12,10 @@ not get detected as gcc (or whatever it actually is). 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 3f05cf7f8c..84a421767d 100644 +index 07778c3474..3f65253308 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py -@@ -232,7 +232,7 @@ class UnixCCompiler(CCompiler): +@@ -233,7 +233,7 @@ class UnixCCompiler(CCompiler): # this time, there's no way to determine this information from # the configuration data stored in the Python installation, so # we use this hack. @@ -25,5 +25,5 @@ index 3f05cf7f8c..84a421767d 100644 # MacOSX's linker doesn't understand the -R flag at all return "-L" + dir -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0009-Win32-Do-not-download-externals.patch b/recipe/patches/0009-Win32-Do-not-download-externals.patch index 5856c59fd..af8c83d03 100644 --- a/recipe/patches/0009-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0009-Win32-Do-not-download-externals.patch @@ -1,14 +1,14 @@ -From 36c19e43a2e4abb941d11eee48e321d24f3b56d3 Mon Sep 17 00:00:00 2001 +From 9ead3d1fc2f35bab3c26129e3c830c89dffa5871 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 09/30] Win32: Do not download externals +Subject: [PATCH 09/29] Win32: Do not download externals --- PCbuild/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index ba7154d8cb..4416597ed9 100644 +index 5a41ca57b1..5f7129f824 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -97,7 +97,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true @@ -21,5 +21,5 @@ index ba7154d8cb..4416597ed9 100644 if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0010-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch b/recipe/patches/0010-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch index 36bb2967a..ecc6a83b3 100644 --- a/recipe/patches/0010-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch +++ b/recipe/patches/0010-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch @@ -1,7 +1,7 @@ -From fe6e847bbea130ace6ad0b018ea34adc16914f55 Mon Sep 17 00:00:00 2001 +From c39bf6a37e4b8754b4fb63a647bdf3c52093d444 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 3 Dec 2017 17:31:27 +0000 -Subject: [PATCH 10/30] Add support for _CONDA_PYTHON_SYSCONFIGDATA_NAME if +Subject: [PATCH 10/29] Add support for _CONDA_PYTHON_SYSCONFIGDATA_NAME if _PYTHON_SYSCONFIGDATA_NAME is not set and ignore {_CONDA,}_PYTHON_SYSCONFIGDATA_NAME if it does not exist @@ -37,10 +37,10 @@ index 37feae5df7..f56ebe6c3a 100644 build_time_vars = _temp.build_time_vars global _config_vars diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index bf04ac541e..3c971b82c2 100644 +index e3f79bfde5..dd995cc2b9 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -341,13 +341,21 @@ def get_makefile_filename(): +@@ -351,13 +351,21 @@ def get_makefile_filename(): return os.path.join(get_path('stdlib'), config_dir_name, 'Makefile') @@ -69,7 +69,7 @@ index bf04ac541e..3c971b82c2 100644 def _generate_posix_vars(): -@@ -416,7 +424,7 @@ def _generate_posix_vars(): +@@ -426,7 +434,7 @@ def _generate_posix_vars(): def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() @@ -79,5 +79,5 @@ index bf04ac541e..3c971b82c2 100644 build_time_vars = _temp.build_time_vars vars.update(build_time_vars) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0011-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0011-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 0572de154..a7b825a62 100644 --- a/recipe/patches/0011-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0011-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,7 +1,7 @@ -From 70e40f6858ac8da70d91869b28792cd5a1e8f076 Mon Sep 17 00:00:00 2001 +From 58a73338461cddd385aaa67682bac34ce3ab9ba0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 11/30] Fix find_library so that it looks in sys.prefix/lib +Subject: [PATCH 11/29] Fix find_library so that it looks in sys.prefix/lib first --- @@ -10,10 +10,10 @@ Subject: [PATCH 11/30] Fix find_library so that it looks in sys.prefix/lib 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index 9d86b05876..9ab447c0a1 100644 +index 1c3f8fd38b..82a4b4fd58 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py -@@ -88,6 +88,10 @@ def dyld_executable_path_search(name, executable_path=None): +@@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None): # If we haven't done any searching and found a library and the # dylib_name starts with "@executable_path/" then construct the # library name. @@ -25,7 +25,7 @@ index 9d86b05876..9ab447c0a1 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 01176bf969..b80dc43b4f 100644 +index 0c2510e161..72b46cc481 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ if os.name == "nt": @@ -72,5 +72,5 @@ index 01176bf969..b80dc43b4f 100644 ################################################################ # test code -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0012-Disable-new-dtags-in-unixccompiler.py.patch b/recipe/patches/0012-Disable-new-dtags-in-unixccompiler.py.patch index d743f059c..404e910cf 100644 --- a/recipe/patches/0012-Disable-new-dtags-in-unixccompiler.py.patch +++ b/recipe/patches/0012-Disable-new-dtags-in-unixccompiler.py.patch @@ -1,7 +1,7 @@ -From c23b6879c789beb899744592bbd5e13a2153c7f1 Mon Sep 17 00:00:00 2001 +From a28c703ff8dcc05afe8a633d0906f0d51a24ccf8 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 29 Apr 2018 16:10:42 +0100 -Subject: [PATCH 12/30] Disable new-dtags in unixccompiler.py +Subject: [PATCH 12/29] Disable new-dtags in unixccompiler.py They prevent isolation from system libraries and the HPC 'modules' system by giving precedence to LD_LIBRARY_PATH. We never want our libraries to @@ -43,10 +43,10 @@ index eef702cf01..2d8d61df03 100644 # GCC GNULD with fully qualified configuration prefix # see #7617 diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 84a421767d..12a9f777fe 100644 +index 3f65253308..ba0580daf1 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py -@@ -248,12 +248,12 @@ class UnixCCompiler(CCompiler): +@@ -249,12 +249,12 @@ class UnixCCompiler(CCompiler): # use it anyway. Since distutils has always passed in # -Wl whenever gcc was used in the past it is probably # safest to keep doing so. @@ -63,5 +63,5 @@ index 84a421767d..12a9f777fe 100644 # No idea how --enable-new-dtags would be passed on to # ld if this system was using GNU ld. Don't know if a -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0013-Fix-cross-compilation-on-Debian-based-distros.patch b/recipe/patches/0013-Fix-cross-compilation-on-Debian-based-distros.patch index e3835a636..b876b0059 100644 --- a/recipe/patches/0013-Fix-cross-compilation-on-Debian-based-distros.patch +++ b/recipe/patches/0013-Fix-cross-compilation-on-Debian-based-distros.patch @@ -1,17 +1,17 @@ -From cad5792683f4a18298adcc214ffa33c9f8ee0c42 Mon Sep 17 00:00:00 2001 +From b68f728529ccd4cbfbbecf1a180f050b1d9e3d07 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 26 Aug 2018 17:10:08 +0100 -Subject: [PATCH 13/30] Fix cross-compilation on Debian-based distros +Subject: [PATCH 13/29] Fix cross-compilation on Debian-based distros --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 41cd6e171c..f2769081e8 100644 +index 0489b616f9..bf81ec096a 100644 --- a/setup.py +++ b/setup.py -@@ -749,7 +749,8 @@ class PyBuildExt(build_ext): +@@ -737,7 +737,8 @@ class PyBuildExt(build_ext): # only change this for cross builds for 3.3, issues on Mageia if CROSS_COMPILING: self.add_cross_compiling_paths() @@ -22,5 +22,5 @@ index 41cd6e171c..f2769081e8 100644 def init_inc_lib_dirs(self): -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0014-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0014-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index b8f518eb0..a7cb3413b 100644 --- a/recipe/patches/0014-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0014-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,7 +1,7 @@ -From a137ff9cf74e0e27414a0d0b440ba994d2844cd5 Mon Sep 17 00:00:00 2001 +From c784b3f3cdfafe149fbd3fd98fb7f4230acd8377 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 14/30] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 14/29] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 --- @@ -37,5 +37,5 @@ index 53da3a6d05..3fc90067c5 100644 anything better to use! */ int skipdefault = (calculate->pythonpath_env != NULL || -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0015-Unvendor-openssl.patch b/recipe/patches/0015-Unvendor-openssl.patch index 7f92a15e4..e36811dba 100644 --- a/recipe/patches/0015-Unvendor-openssl.patch +++ b/recipe/patches/0015-Unvendor-openssl.patch @@ -1,22 +1,22 @@ -From 3d0b31d720a7eda8a597c0d433b976c245a532f4 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 15/30] Unvendor openssl - ---- - PCbuild/_ssl.vcxproj | 3 --- - PCbuild/_ssl.vcxproj.filters | 3 --- - PCbuild/openssl.props | 2 +- - PCbuild/python.props | 6 +++--- - PCbuild/python.vcxproj | 3 +++ - PCbuild/pythonw.vcxproj | 3 +++ - 6 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index 4907f49b66..b2c23d5e8c 100644 ---- a/PCbuild/_ssl.vcxproj -+++ b/PCbuild/_ssl.vcxproj -@@ -99,9 +99,6 @@ +From 776a964502e787ee408b7b6687ba402fc21e9cae Mon Sep 17 00:00:00 2001 +From: Nehal J Wani +Date: Sat, 24 Nov 2018 20:38:02 -0600 +Subject: [PATCH 15/29] Unvendor openssl + +--- + PCbuild/_ssl.vcxproj | 3 --- + PCbuild/_ssl.vcxproj.filters | 3 --- + PCbuild/openssl.props | 2 +- + PCbuild/python.props | 6 +++--- + PCbuild/python.vcxproj | 3 +++ + PCbuild/pythonw.vcxproj | 3 +++ + 6 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj +index 4907f49b66..b2c23d5e8c 100644 +--- a/PCbuild/_ssl.vcxproj ++++ b/PCbuild/_ssl.vcxproj +@@ -99,9 +99,6 @@ @@ -26,11 +26,11 @@ index 4907f49b66..b2c23d5e8c 100644 -diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters -index 716a69a41a..8aef9e03fc 100644 ---- a/PCbuild/_ssl.vcxproj.filters -+++ b/PCbuild/_ssl.vcxproj.filters -@@ -12,9 +12,6 @@ +diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters +index 716a69a41a..8aef9e03fc 100644 +--- a/PCbuild/_ssl.vcxproj.filters ++++ b/PCbuild/_ssl.vcxproj.filters +@@ -12,9 +12,6 @@ Source Files @@ -40,11 +40,11 @@ index 716a69a41a..8aef9e03fc 100644 -diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index a7e16793c7..af1350cae7 100644 ---- a/PCbuild/openssl.props -+++ b/PCbuild/openssl.props -@@ -5,7 +5,7 @@ +diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props +index a7e16793c7..af1350cae7 100644 +--- a/PCbuild/openssl.props ++++ b/PCbuild/openssl.props +@@ -5,7 +5,7 @@ $(opensslIncludeDir);%(AdditionalIncludeDirectories) @@ -53,11 +53,11 @@ index a7e16793c7..af1350cae7 100644 ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies) -diff --git a/PCbuild/python.props b/PCbuild/python.props -index 42c67de4af..4c5c18a81d 100644 ---- a/PCbuild/python.props -+++ b/PCbuild/python.props -@@ -63,9 +63,9 @@ +diff --git a/PCbuild/python.props b/PCbuild/python.props +index 42c67de4af..4c5c18a81d 100644 +--- a/PCbuild/python.props ++++ b/PCbuild/python.props +@@ -63,9 +63,9 @@ $(ExternalsDir)libffi-3.3.0\ $(ExternalsDir)libffi-3.3.0\$(ArchName)\ $(libffiOutDir)include @@ -70,11 +70,11 @@ index 42c67de4af..4c5c18a81d 100644 $(ExternalsDir)\nasm-2.11.06\ $(ExternalsDir)\zlib-1.2.11\ -diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 2094420a8d..ffb2673018 100644 ---- a/PCbuild/python.vcxproj -+++ b/PCbuild/python.vcxproj -@@ -105,6 +105,9 @@ +diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj +index 2094420a8d..ffb2673018 100644 +--- a/PCbuild/python.vcxproj ++++ b/PCbuild/python.vcxproj +@@ -105,6 +105,9 @@ @@ -84,11 +84,11 @@ index 2094420a8d..ffb2673018 100644 -diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index e7216dec3a..ab572d2020 100644 ---- a/PCbuild/pythonw.vcxproj -+++ b/PCbuild/pythonw.vcxproj -@@ -97,6 +97,9 @@ +diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj +index e7216dec3a..ab572d2020 100644 +--- a/PCbuild/pythonw.vcxproj ++++ b/PCbuild/pythonw.vcxproj +@@ -97,6 +97,9 @@ @@ -99,5 +99,5 @@ index e7216dec3a..ab572d2020 100644 -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0016-Unvendor-sqlite3.patch b/recipe/patches/0016-Unvendor-sqlite3.patch index 02fd67ce2..dd55d2206 100644 --- a/recipe/patches/0016-Unvendor-sqlite3.patch +++ b/recipe/patches/0016-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From c3f4e248b58c6d5fc393d1c8b057c99fca3fc5be Mon Sep 17 00:00:00 2001 +From c57a395fc979fd293767ab5d508c0c5b4637cc5b Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 10 Dec 2018 12:22:37 -0600 -Subject: [PATCH 16/30] Unvendor sqlite3 +Subject: [PATCH 16/29] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 9 ++++----- @@ -53,10 +53,10 @@ index 4b6dc1e677..19d75c75b8 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" diff --git a/PCbuild/python.props b/PCbuild/python.props -index 9c2838b162..2360417748 100644 +index 4c5c18a81d..7b99766d21 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ $(EXTERNALS_DIR) $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ @@ -64,7 +64,7 @@ index 9c2838b162..2360417748 100644 + $(SQLITE3_DIR)\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ - $(ExternalsDir)libffi\ + $(ExternalsDir)libffi-3.3.0\ diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index 7351a6dda2..56d18cfa94 100644 --- a/PCbuild/sqlite3.vcxproj @@ -89,5 +89,5 @@ index 7351a6dda2..56d18cfa94 100644 -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0017-venv-Revert-a-change-from-https-github.com-python-cp.patch b/recipe/patches/0017-venv-Revert-a-change-from-https-github.com-python-cp.patch index d40c556dc..60f049cca 100644 --- a/recipe/patches/0017-venv-Revert-a-change-from-https-github.com-python-cp.patch +++ b/recipe/patches/0017-venv-Revert-a-change-from-https-github.com-python-cp.patch @@ -1,7 +1,7 @@ -From f6559d3e3adb952d3c007a084166cc5da1bd9873 Mon Sep 17 00:00:00 2001 +From 54008e01203489367537dbaf4840fd9991445dbc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 2 Jan 2019 21:38:48 +0000 -Subject: [PATCH 17/30] venv: Revert a change from +Subject: [PATCH 17/29] venv: Revert a change from https://github.com/python/cpython/commit/1c3de541e64f75046b20cdd27bada1557e550bcd https://bugs.python.org/issue35644 @@ -42,5 +42,5 @@ index 8009deb3ea..e4fd6db818 100644 os.chmod(path, 0o755) for suffix in ('python', 'python3', f'python3.{sys.version_info[1]}'): -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0018-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch b/recipe/patches/0018-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch index a87388da6..f21ce7620 100644 --- a/recipe/patches/0018-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch +++ b/recipe/patches/0018-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch @@ -1,7 +1,7 @@ -From d307ed7b926b06f9ec4e2ceb6da38ce7c6c68c2a Mon Sep 17 00:00:00 2001 +From 4cc2be15cc4da565a8704be8e88c7d3fd9698435 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 16:46:21 -0400 -Subject: [PATCH 18/30] Win: Add back the DLLSuffix used to find the openssl +Subject: [PATCH 18/29] Win: Add back the DLLSuffix used to find the openssl dlls and debug files --- @@ -21,5 +21,5 @@ index af1350cae7..eeb8677517 100644 <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0019-Use-ranlib-from-env-if-env-variable-is-set.patch b/recipe/patches/0019-Use-ranlib-from-env-if-env-variable-is-set.patch index 5cb8d52d2..427cf168b 100644 --- a/recipe/patches/0019-Use-ranlib-from-env-if-env-variable-is-set.patch +++ b/recipe/patches/0019-Use-ranlib-from-env-if-env-variable-is-set.patch @@ -1,7 +1,7 @@ -From e3eae5df830e7c53d0d6fd38b55bff648aeec37a Mon Sep 17 00:00:00 2001 +From 1a158e52b735028f75abc43706debd9c9e757582 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 3 Nov 2019 15:09:45 -0600 -Subject: [PATCH 19/30] Use ranlib from env if env variable is set +Subject: [PATCH 19/29] Use ranlib from env if env variable is set --- Lib/distutils/sysconfig.py | 3 +++ @@ -22,5 +22,5 @@ index f56ebe6c3a..8658c84797 100644 -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch index c97841f70..0f5c29063 100644 --- a/recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From 9eb3eea71dcbe3c9c2649169bd35614998b1c650 Mon Sep 17 00:00:00 2001 +From 5495c5d7afcd94a6993e4806d686cdc45293baff Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 20/30] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 20/29] Add CondaEcosystemModifyDllSearchPath() This changes the DLL search order so that C:\Windows\System32 does not get searched in before entries in PATH. @@ -40,7 +40,7 @@ index 4afa4ebd42..83fc43d874 100644 class _FuncPtr(_CFuncPtr): _flags_ = flags diff --git a/Modules/main.c b/Modules/main.c -index 4a76f4461b..10343115b8 100644 +index 2cc891f61a..2b6b9855c4 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -17,6 +17,10 @@ @@ -72,7 +72,7 @@ index 4a76f4461b..10343115b8 100644 if (config->site_import) { fprintf(stderr, "%s\n", COPYRIGHT); } -@@ -687,10 +693,402 @@ Py_RunMain(void) +@@ -691,10 +697,402 @@ Py_RunMain(void) return exitcode; } @@ -476,10 +476,10 @@ index 4a76f4461b..10343115b8 100644 if (_PyStatus_IS_EXIT(status)) { pymain_free(); diff --git a/Python/dynload_win.c b/Python/dynload_win.c -index 8431c5b3b2..1b3e275614 100644 +index 81787e5f22..ddd2d72989 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c -@@ -187,10 +187,13 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, +@@ -190,10 +190,13 @@ _Py_COMP_DIAG_POP to avoid DLL preloading attacks and enable use of the AddDllDirectory function. We add SEARCH_DLL_LOAD_DIR to ensure DLLs adjacent to the PYD are preferred. */ @@ -496,5 +496,5 @@ index 8431c5b3b2..1b3e275614 100644 /* restore old error mode settings */ -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0021-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch b/recipe/patches/0021-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch index 48c6557cb..34cbfd3af 100644 --- a/recipe/patches/0021-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch +++ b/recipe/patches/0021-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch @@ -1,7 +1,7 @@ -From 0d70da5df95503fdaf6d5847733370eb22baf6c7 Mon Sep 17 00:00:00 2001 +From 23953840a6fe6c1b6cd72dcebca4206ed1e220dd Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 20:46:36 +0100 -Subject: [PATCH 21/30] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable +Subject: [PATCH 21/29] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable --- Lib/distutils/_msvccompiler.py | 9 ++++++++- @@ -35,5 +35,5 @@ index af8099a407..8f73453a6c 100644 args.append('/EHsc') args.append(input_opt) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0022-Doing-d1trimfile.patch b/recipe/patches/0022-Doing-d1trimfile.patch index 4e15505b5..ae141ee0c 100644 --- a/recipe/patches/0022-Doing-d1trimfile.patch +++ b/recipe/patches/0022-Doing-d1trimfile.patch @@ -1,7 +1,7 @@ -From 383752963a4ce4c08d052b28842e843567ae4079 Mon Sep 17 00:00:00 2001 +From 246cb397a6075afe2c767d2f1d1b686f024db3a3 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 22/30] Doing d1trimfile +Subject: [PATCH 22/29] Doing d1trimfile --- PC/bdist_wininst/bdist_wininst.vcxproj | 4 ++++ @@ -873,5 +873,5 @@ index 776335a15c..6e9e556e81 100644 wsock32.lib;%(AdditionalDependencies) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0023-egg-debugging-with-Windows-debug-builds.patch b/recipe/patches/0023-egg-debugging-with-Windows-debug-builds.patch index aac507ba3..285a362ee 100644 --- a/recipe/patches/0023-egg-debugging-with-Windows-debug-builds.patch +++ b/recipe/patches/0023-egg-debugging-with-Windows-debug-builds.patch @@ -1,7 +1,7 @@ -From d5081f47837fe8de279c06c4b26ce2a6da02a3f2 Mon Sep 17 00:00:00 2001 +From 3413c394b69690f5e622d0e499c5c2587b9adfa5 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 12 Feb 2020 21:35:50 +0100 -Subject: [PATCH 23/30] egg debugging with Windows debug builds +Subject: [PATCH 23/29] egg debugging with Windows debug builds --- Lib/zipimport.py | 1 + @@ -20,5 +20,5 @@ index 5ef0a17c2a..4e8d8da1f6 100644 _bootstrap._verbose_message('zipimport: found {} names in {!r}', count, archive) return files -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0024-Add-CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL-to-aid-de.patch b/recipe/patches/0024-Add-CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL-to-aid-de.patch index 323cc698e..03438a524 100644 --- a/recipe/patches/0024-Add-CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL-to-aid-de.patch +++ b/recipe/patches/0024-Add-CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL-to-aid-de.patch @@ -1,7 +1,7 @@ -From b994e0849ac776321ff1e91c6c8cdd6a31d107ab Mon Sep 17 00:00:00 2001 +From 0e768bfe6873ec3701a4fd99830c86f55a9c7347 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 18 Feb 2020 17:38:32 +0100 -Subject: [PATCH 24/30] Add CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL to aid +Subject: [PATCH 24/29] Add CONDA_DLL_SEARCH_MODIFICATION_KEEP_GIL to aid debugging extension module load issues LIEF (before it was fixed) crashed because Python code gets called from its static initialization @@ -12,14 +12,14 @@ be useful when debugging strange extension module import issues. There really isn't any way to get the ProcAddress without allowing static initialization to happen --- - Python/dynload_win.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) + Python/dynload_win.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Python/dynload_win.c b/Python/dynload_win.c -index 1b3e275614..071c2623b1 100644 +index ddd2d72989..1202521e3d 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c -@@ -179,6 +179,11 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, +@@ -182,6 +182,11 @@ _Py_COMP_DIAG_POP { HINSTANCE hDLL = NULL; unsigned int old_mode; @@ -31,7 +31,7 @@ index 1b3e275614..071c2623b1 100644 /* Don't display a message box when Python can't load a DLL */ old_mode = SetErrorMode(SEM_FAILCRITICALERRORS); -@@ -191,10 +196,15 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, +@@ -194,10 +199,15 @@ _Py_COMP_DIAG_POP extern int CondaEcosystemModifyDllSearchPath(int, int); CondaEcosystemModifyDllSearchPath(1, 1); @@ -52,5 +52,5 @@ index 1b3e275614..071c2623b1 100644 /* restore old error mode settings */ SetErrorMode(old_mode); -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0025-cross-compile-darwin.patch b/recipe/patches/0025-cross-compile-darwin.patch index 0615e85a1..1333592f4 100644 --- a/recipe/patches/0025-cross-compile-darwin.patch +++ b/recipe/patches/0025-cross-compile-darwin.patch @@ -1,7 +1,7 @@ -From b00423aa4195fc140328219d36b12cee4d24e17f Mon Sep 17 00:00:00 2001 +From 623ec53873d65b0548d0832f3c9ea6689c00d464 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 -Subject: [PATCH 25/30] cross compile darwin +Subject: [PATCH 25/29] cross compile darwin By Isuru Fernando. --- @@ -11,10 +11,10 @@ By Isuru Fernando. 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py -index e9f50ab622..408587d36c 100755 +index d6412e169b..618c993205 100755 --- a/Lib/platform.py +++ b/Lib/platform.py -@@ -409,7 +409,12 @@ def win32_ver(release='', version='', csd='', ptype=''): +@@ -411,7 +411,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,10 +29,10 @@ index e9f50ab622..408587d36c 100755 try: import plistlib diff --git a/configure b/configure -index a8e2400a15..f13bc8cbe0 100755 +index 45db05e75d..49943703fd 100755 --- a/configure +++ b/configure -@@ -3339,6 +3339,8 @@ fi +@@ -3342,6 +3342,8 @@ fi $as_echo "\"$MACHDEP\"" >&6; } @@ -41,7 +41,7 @@ index a8e2400a15..f13bc8cbe0 100755 if test "$cross_compiling" = yes; then case "$host" in *-*-linux*) -@@ -3363,6 +3365,7 @@ if test "$cross_compiling" = yes; then +@@ -3366,6 +3368,7 @@ if test "$cross_compiling" = yes; then esac _PYTHON_HOST_PLATFORM="$MACHDEP${_host_cpu:+-$_host_cpu}" fi @@ -49,7 +49,7 @@ index a8e2400a15..f13bc8cbe0 100755 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they # disable features if it is defined, without any means to access these -@@ -6210,7 +6213,7 @@ fi +@@ -6213,7 +6216,7 @@ fi if test "$cross_compiling" = yes; then case "$READELF" in readelf|:) @@ -58,7 +58,7 @@ index a8e2400a15..f13bc8cbe0 100755 ;; esac fi -@@ -9326,7 +9329,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -9364,7 +9367,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -67,7 +67,7 @@ index a8e2400a15..f13bc8cbe0 100755 if test "${ac_osx_32bit}" = "yes"; then case `/usr/bin/arch` in i386) -@@ -9353,6 +9356,7 @@ fi +@@ -9394,6 +9397,7 @@ fi esac fi @@ -76,10 +76,10 @@ index a8e2400a15..f13bc8cbe0 100755 LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}" LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' diff --git a/setup.py b/setup.py -index f2769081e8..a95162b43a 100644 +index bf81ec096a..6f12fb060a 100644 --- a/setup.py +++ b/setup.py -@@ -61,7 +61,7 @@ CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ) +@@ -62,7 +62,7 @@ CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ) HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') CYGWIN = (HOST_PLATFORM == 'cygwin') @@ -89,5 +89,5 @@ index f2769081e8..a95162b43a 100644 VXWORKS = ('vxworks' in HOST_PLATFORM) -- -2.23.0 +2.32.0.windows.2 diff --git a/recipe/patches/0032-Fix-TZPATH-on-windows.patch b/recipe/patches/0026-Fix-TZPATH-on-windows.patch similarity index 73% rename from recipe/patches/0032-Fix-TZPATH-on-windows.patch rename to recipe/patches/0026-Fix-TZPATH-on-windows.patch index 6c36da77d..704c1725b 100644 --- a/recipe/patches/0032-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0026-Fix-TZPATH-on-windows.patch @@ -1,17 +1,17 @@ -From 1218ca492f4781ffc680e4a450ca1933ddcb29f4 Mon Sep 17 00:00:00 2001 +From b3a8208fa78a2836fdf2d228c8c95514fe217cea Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH] Fix TZPATH on windows +Subject: [PATCH 26/29] Fix TZPATH on windows --- Lib/sysconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index bf04ac541e..11e81d4f44 100644 +index dd995cc2b9..8ced8d1f08 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -546,7 +546,7 @@ def get_config_vars(*args): +@@ -567,7 +567,7 @@ def get_config_vars(*args): if os.name == 'nt': _init_non_posix(_CONFIG_VARS) @@ -21,5 +21,5 @@ index bf04ac541e..11e81d4f44 100644 _init_posix(_CONFIG_VARS) # For backward compatibility, see issue19555 -- -2.28.0 +2.32.0.windows.2 diff --git a/recipe/patches/0033-gh24324.patch b/recipe/patches/0027-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch similarity index 89% rename from recipe/patches/0033-gh24324.patch rename to recipe/patches/0027-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index aeb2fb5fc..e54b24d6b 100644 --- a/recipe/patches/0033-gh24324.patch +++ b/recipe/patches/0027-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,7 +1,7 @@ -From afddfa8176cf8969055c6319504069b250723d3d Mon Sep 17 00:00:00 2001 +From aa0c275e1abaa070d745172a069253e00b61426d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH] Make dyld search work with SYSTEM_VERSION_COMPAT=1 +Subject: [PATCH 27/29] Make dyld search work with SYSTEM_VERSION_COMPAT=1 In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15` or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur @@ -28,5 +28,5 @@ index b0f1e0bd04..f382971dbd 100644 // Support the deprecated case of compiling on an older macOS version static void *libsystem_b_handle; -- -2.33.0 +2.32.0.windows.2 diff --git a/recipe/patches/0034-distutils-fix-ldshared.patch b/recipe/patches/0028-Fix-distutils-ldshared-overriding-when-a-compiler-is.patch similarity index 64% rename from recipe/patches/0034-distutils-fix-ldshared.patch rename to recipe/patches/0028-Fix-distutils-ldshared-overriding-when-a-compiler-is.patch index 74aa24f18..1f0c9b21a 100644 --- a/recipe/patches/0034-distutils-fix-ldshared.patch +++ b/recipe/patches/0028-Fix-distutils-ldshared-overriding-when-a-compiler-is.patch @@ -1,5 +1,15 @@ +From 9ae4c2ebcbc3c28b30da389ad9d543251e9e9076 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Tue, 6 Jul 2021 16:49:45 -0500 +Subject: [PATCH 28/29] Fix distutils ldshared overriding when a compiler is + set in environ + +--- + Lib/distutils/sysconfig.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 37feae5df7..47cb61854f 100644 +index 8658c84797..f970efc57c 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -199,10 +199,9 @@ def customize_compiler(compiler): @@ -15,3 +25,6 @@ index 37feae5df7..47cb61854f 100644 # command for LDSHARED as well ldshared = newcc + ldshared[len(cc):] cc = newcc +-- +2.32.0.windows.2 + diff --git a/recipe/patches/0035-set-ssltag-to-3.patch b/recipe/patches/0029-Set-ssltag-to-3.patch similarity index 66% rename from recipe/patches/0035-set-ssltag-to-3.patch rename to recipe/patches/0029-Set-ssltag-to-3.patch index f5401cd6d..5527bf17e 100644 --- a/recipe/patches/0035-set-ssltag-to-3.patch +++ b/recipe/patches/0029-Set-ssltag-to-3.patch @@ -1,16 +1,30 @@ -From bd7adc3ebd5e6bdf6d7f7fe38e06bf4f17d2168f Mon Sep 17 00:00:00 2001 +From eb3e4e0dbd5a925825cd2fb989033d8b1860cfc0 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 28 Sep 2021 12:40:44 +0200 -Subject: [PATCH] Set ssltag to 3 +Subject: [PATCH 29/29] Set ssltag to 3 --- - Tools/msi/msi.props | 2 +- PCbuild/openssl.props | 2 +- + Tools/msi/msi.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props +index eeb8677517..57caf8f2fc 100644 +--- a/PCbuild/openssl.props ++++ b/PCbuild/openssl.props +@@ -10,7 +10,7 @@ + + + +- <_DLLSuffix>-1_1 ++ <_DLLSuffix>-3 + <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64 + <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props ---- a/Tools/msi/msi.props 2021-09-28 13:28:28.000000000 +0200 -+++ b/Tools/msi/msi.props 2021-09-28 13:27:51.000000000 +0200 +index cb9221fddf..9c7226fdf1 100644 +--- a/Tools/msi/msi.props ++++ b/Tools/msi/msi.props @@ -88,7 +88,7 @@ PyArchExt=$(PyArchExt); PyTestExt=$(PyTestExt); @@ -20,14 +34,6 @@ diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props $(DefineConstants);CRTRedist=$(CRTRedist); ---- a/PCbuild/openssl.props 2021-09-28 13:57:44.000000000 +0200 -+++ b/PCbuild/openssl.props 2021-09-28 13:58:49.000000000 +0200 -@@ -10,7 +10,7 @@ - - - -- <_DLLSuffix>-1_1 -+ <_DLLSuffix>-3 - <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm - <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 - +-- +2.32.0.windows.2 +
VariantStatus
linux_64linux_64_openssl1.1.1 - variant + variant
linux_aarch64linux_64_openssl3 - variant + variant
linux_ppc64lelinux_aarch64_openssl1.1.1 - variant + variant
osx_64linux_aarch64_openssl3 - variant + variant
osx_arm64linux_ppc64le_openssl1.1.1 - variant + variant
win_64linux_ppc64le_openssl3 - variant + variant + +
osx_64_openssl1.1.1 + + variant + +
osx_64_openssl3 + + variant + +
osx_arm64_openssl1.1.1 + + variant + +
osx_arm64_openssl3 + + variant + +
win_64_openssl1.1.1 + + variant + +
win_64_openssl3 + + variant