Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.10.20" %}
{% set version = "3.10.21" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
{% set ver3nd = ''.join(version.split('.')[0:3]) %}
{% set build_number = 1 %}
{% set build_number = 0 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down Expand Up @@ -47,7 +47,7 @@ source:
{% else %}
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
sha256: de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505
sha256: a0da1e72132e950154eca0f6f47d5db828454700de20e5113667940d81e0db04
{% endif %}
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
Expand Down Expand Up @@ -83,8 +83,6 @@ source:
- patches/0024-unvendor-zlib.patch
- patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
- patches/0026-Unvendor-expat.patch
# backport https://github.com/python/cpython/pull/100373
- patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch

build:
number: {{ build_number }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d90bf48069c628f8b49d3b14ea50516232430056 Mon Sep 17 00:00:00 2001
From 664e2356fdbd34f87e4a2cb3f59c97dd1e6026e9 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:53:55 +0100
Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048
Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048

https://github.com/ContinuumIO/anaconda-issues/issues/1241
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8bd1fc261aa011920bf689212738fd8b96bcbd03 Mon Sep 17 00:00:00 2001
From 76e282d3720759bd681934774ea3d710e8c5fa69 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:59:00 +0100
Subject: [PATCH 02/27] Win32: distutils: Add support to cygwinccompiler for
Subject: [PATCH 02/26] Win32: distutils: Add support to cygwinccompiler for
VS>=2015

Really this is for mingw-w64 though
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0003-Support-cross-compiling-byte-code.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b99a8df226dcc6f83322971b2e65316b9235934c Mon Sep 17 00:00:00 2001
From 6473bec059b0b98c2d96198ce87c2d453645c852 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 12:17:33 +0100
Subject: [PATCH 03/27] Support cross-compiling byte-code
Subject: [PATCH 03/26] Support cross-compiling byte-code

https://bugs.python.org/issue22724
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2531597720a73cca27a1871a1d654d9dced1c218 Mon Sep 17 00:00:00 2001
From 957a0e6e879f4e43769c78dc76ffafb2cda862eb Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 21 Sep 2021 13:05:20 -0500
Subject: [PATCH 04/27] bpo-45258: search for -isysroot in addition to
Subject: [PATCH 04/26] bpo-45258: search for -isysroot in addition to
--sysroot

-isysroot is for macOS, while --sysroot is for gcc/linux
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0a1f271aea29d6c0691860643f3383d8f3bc5118 Mon Sep 17 00:00:00 2001
From 42fe97e6cbb184cda0e2c96b63e227627828ddf8 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 5 Oct 2017 02:00:41 +0100
Subject: [PATCH 05/27] runtime_library_dir_option: Use 1st word of CC as
Subject: [PATCH 05/26] 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
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0006-Win32-Do-not-download-externals.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 678488a772e807546a4763ac17010f5bb7288029 Mon Sep 17 00:00:00 2001
From 4892411b32b8b4e46fc00e75504daf3e25ecd610 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 7 Sep 2017 11:35:47 +0100
Subject: [PATCH 06/27] Win32: Do not download externals
Subject: [PATCH 06/26] Win32: Do not download externals

---
PCbuild/build.bat | 2 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5ab8259dcb27d5c38fe2ccec3f2b090eed44e647 Mon Sep 17 00:00:00 2001
From d69ba7d9a48299238f7c564f99234e56ea74dcca Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 5 Dec 2017 22:47:59 +0000
Subject: [PATCH 07/27] Fix find_library so that it looks in sys.prefix/lib
Subject: [PATCH 07/26] Fix find_library so that it looks in sys.prefix/lib
first

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9b4fb93be060983edfca1bbffc404e699f807dd4 Mon Sep 17 00:00:00 2001
From 2936ce4d00b332f2539524c00571bff9cfac5f02 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Thu, 16 Sep 2021 15:46:09 -0500
Subject: [PATCH 08/27] bpo-22699: Allow compiling on debian/ubuntu with a
Subject: [PATCH 08/26] bpo-22699: Allow compiling on debian/ubuntu with a
different compiler

This PR fixes one issue mentioned in the bpo
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 138a7f1c63f9dbdb98da5011d99f1d1131059b5f Mon Sep 17 00:00:00 2001
From 250524b831eaf0684399911a5285a8cb582109a1 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Sat, 27 Oct 2018 18:48:30 +0100
Subject: [PATCH 09/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
Subject: [PATCH 09/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
is not 0

---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0010-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7c32bbf7a8e35efcfc6fccac3be3b88ad9d6d0cb Mon Sep 17 00:00:00 2001
From f5bad88adbed923fe017d01691cdec1ce1c8e562 Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Sat, 24 Nov 2018 20:38:02 -0600
Subject: [PATCH 10/27] Unvendor openssl
Subject: [PATCH 10/26] Unvendor openssl

Co-authored-by: Isuru Fernando <isuruf@gmail.com>
---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0011-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 464469d29ed8a1edf449254dc7b67cc525342f96 Mon Sep 17 00:00:00 2001
From 13fddbf07b7cdf832b90e4a2ab56cbaaf38703f2 Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Tue, 5 Oct 2021 12:42:06 -0700
Subject: [PATCH 11/27] Unvendor sqlite3
Subject: [PATCH 11/26] Unvendor sqlite3

---
PCbuild/_sqlite3.vcxproj | 9 ++++-----
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c4cb6f93d3fa86d89fa2f07a4d8c855f63d9aef7 Mon Sep 17 00:00:00 2001
From d7816251bb78db7b8ac45f9081bf41be9e7b02dd Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sun, 3 Nov 2019 15:09:45 -0600
Subject: [PATCH 12/27] Use ranlib from env if env variable is set
Subject: [PATCH 12/26] Use ranlib from env if env variable is set

---
Lib/distutils/sysconfig.py | 3 +++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a2480fc4455eaf5a143e662d57981e5c323723bb Mon Sep 17 00:00:00 2001
From dcdf1dee198f8fc7a63828ec179bcd23096a0211 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 24 Dec 2019 18:37:17 +0100
Subject: [PATCH 13/27] Add CondaEcosystemModifyDllSearchPath()
Subject: [PATCH 13/26] Add CondaEcosystemModifyDllSearchPath()

There are 2 modes depending on CONDA_DLL_SEARCH_MODIFICATION env variable

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d41109addfba685eeb4c16a733987b8932d77f15 Mon Sep 17 00:00:00 2001
From 422fe2754b69fd46b815cf97e6040c690d43f13a Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 31 Dec 2019 20:46:36 +0100
Subject: [PATCH 14/27] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
Subject: [PATCH 14/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable

---
Lib/distutils/_msvccompiler.py | 9 ++++++++-
Expand Down
12 changes: 6 additions & 6 deletions recipe/patches/0015-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 89a0be2ad0fa43c8e6330f9bc8ac42f4336fb9a1 Mon Sep 17 00:00:00 2001
From 38058502bcf78ccea4493ae11b92e7e8d63d8e6e Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 31 Dec 2019 21:47:47 +0100
Subject: [PATCH 15/27] Doing d1trimfile
Subject: [PATCH 15/26] Doing d1trimfile

---
PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++
Expand Down Expand Up @@ -156,13 +156,13 @@ index 0916f1a2d37..17a4cbfcd7c 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 4a125b243b7..20cc09d63ff 100644
index 8aad9513e35..ec55d5c981e 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -95,6 +95,10 @@
<ClCompile>
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_POOR_ENTROPY;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
Expand Down Expand Up @@ -584,13 +584,13 @@ index 4dd42ab98a9..7c2dbc7e701 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index b2d9f5d57d4..26ac82980ca 100644
index 27b0123c777..a5c01c6bc6f 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -92,6 +92,10 @@
<ClCompile>
<AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_POOR_ENTROPY;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0016-cross-compile-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 28fe86f8a9abad9fa08616fd249e5a24b8bb8d71 Mon Sep 17 00:00:00 2001
From 6fd1398ae9b032b26f98b01f4d8e5dd46e1d4eb2 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 2 Oct 2020 00:03:12 +0200
Subject: [PATCH 16/27] cross compile darwin
Subject: [PATCH 16/26] cross compile darwin

By Isuru Fernando.
---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0017-Fix-TZPATH-on-windows.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 479536de92fe29ef4cbf0c0f0a8aac1a02af36b8 Mon Sep 17 00:00:00 2001
From 5abfc2e9f4c53c5e8794e847922e40ead4488046 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 7 Oct 2020 10:08:30 -0500
Subject: [PATCH 17/27] Fix TZPATH on windows
Subject: [PATCH 17/26] Fix TZPATH on windows

---
Lib/sysconfig.py | 1 +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8d74bd3c5fe8a400d0b37696b03f63c0ab722008 Mon Sep 17 00:00:00 2001
From 19048581ca7c132b08925ee485d12ba27baf5a0e Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 25 Jan 2021 03:28:08 -0600
Subject: [PATCH 18/27] Make dyld search work with SYSTEM_VERSION_COMPAT=1
Subject: [PATCH 18/26] 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 621a2396b9879263ed8a9a8f17857b240e9e405a Mon Sep 17 00:00:00 2001
From 9db97dceb515b1860f73bb8868422b4274ac7b9c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:18:50 -0700
Subject: [PATCH 19/27] Fix LDSHARED when CC is overriden on Linux too
Subject: [PATCH 19/26] Fix LDSHARED when CC is overriden on Linux too

---
Lib/distutils/sysconfig.py | 5 ++---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0020-Unvendor-bzip2.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 377d101255ea5687b4dcb81a1aee9e090b3794c5 Mon Sep 17 00:00:00 2001
From d80291c3d64900625d4bc591c2924007daa7dc6b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:56:27 -0700
Subject: [PATCH 20/27] Unvendor bzip2
Subject: [PATCH 20/26] Unvendor bzip2

---
PCbuild/_bz2.vcxproj | 15 +++++----------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0021-Unvendor-libffi.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 96be926cb9fe2aeea544ecfc3839a88347f78d74 Mon Sep 17 00:00:00 2001
From 3b5d0cbe4b3aecd5197c6b65552fda0917101134 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 03:07:40 -0700
Subject: [PATCH 21/27] Unvendor libffi
Subject: [PATCH 21/26] Unvendor libffi

---
PCbuild/libffi.props | 15 +++------------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0022-Unvendor-tcltk.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 593d2b046a3c412fd2c9f7dcb561f94e4cecd56c Mon Sep 17 00:00:00 2001
From 90fe3783c82fb0dffce2ddede7c26c235cfb85ce Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 20 Aug 2021 10:23:51 -0700
Subject: [PATCH 22/27] Unvendor tcltk
Subject: [PATCH 22/26] Unvendor tcltk

---
PCbuild/tcltk.props | 8 ++++----
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0023-unvendor-xz.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0fa654de11ce3095841a6113d232f0070edd341b Mon Sep 17 00:00:00 2001
From ac0c2638890346fea3f81a8c13503914939d34c9 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 25 Sep 2021 10:07:05 -0700
Subject: [PATCH 23/27] unvendor xz
Subject: [PATCH 23/26] unvendor xz

---
PCbuild/_lzma.vcxproj | 10 +++-------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0024-unvendor-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c8d1db5666af8dfb17fa80e988c58327c8b5f12c Mon Sep 17 00:00:00 2001
From 8e3be19ebe2b3543988fd7a08e9141c7b7d1dbc8 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 29 Sep 2021 15:21:55 -0700
Subject: [PATCH 24/27] unvendor zlib
Subject: [PATCH 24/26] unvendor zlib

---
PCbuild/pythoncore.vcxproj | 33 ++-------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1342fec25aec89d6c7ac222848aa6747c5931e69 Mon Sep 17 00:00:00 2001
From 52513b2bb34d129063ec179ce799aded30f9eaf2 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:45:28 +0100
Subject: [PATCH 25/27] Do not pass -g to GCC when not Py_DEBUG
Subject: [PATCH 25/26] Do not pass -g to GCC when not Py_DEBUG

This bloats our exe and our modules a lot.
---
Expand Down
Loading