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
2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.15.0" %}
{% set dev = "rc2" %}
{% set dev = "rc3" %}
{% 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 = 3 %}
{% set build_number = 0 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down Expand Up @@ -64,7 +64,7 @@ package:
source:
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
sha256: 8d93af5eaaaea5adfd41bd786a7ba3f03f2ad1ab57c6a65e0b963deab91d5ad7
sha256: 506630aa66d5441188f34df22c0760bfe87fc92212630493ebc9ff3b3a7a1d49
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-Do-not-download-externals.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e95e0a73e03308457d942b25ac76b32b0b51ffd4 Mon Sep 17 00:00:00 2001
From f036da29fb98192e03f2ba45f3ee933dedb3d5e1 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/28] Win32: Change FD_SETSIZE from 512 to 2048
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ad969c54aedf9c19fbf569d02314384e7de13b8c Mon Sep 17 00:00:00 2001
From c3814cb69a533516ace23cd5645cc21b55dfb3ef 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 02/28] Win32: Do not download externals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67873a5edb37fb95f73ab578833b2b48ef4f12bc Mon Sep 17 00:00:00 2001
From a043e5d152f9110fab42a6d24d5d1a8ede2cb055 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 03/28] Fix find_library so that it looks in sys.prefix/lib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f61c190e56bb0cb6afdbc42588bbaf1d71e78e55 Mon Sep 17 00:00:00 2001
From 8d5123e3e8e0b938278e17661a93881948f3a58e 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 04/28] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0005-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 77ba27c403b83b8decb4b429acca2d7fe8c723bf Mon Sep 17 00:00:00 2001
From c6e469fbdfc12ded2f67d804763239ac83d24a93 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 05/28] Unvendor openssl
Expand Down Expand Up @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644
<Target Name="CleanAll">
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 79f705a1ed3..744ce0c540a 100644
index 4c49decd749..744ce0c540a 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -91,6 +91,7 @@
Expand All @@ -105,15 +105,15 @@ index 79f705a1ed3..744ce0c540a 100644
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />

<PropertyGroup>
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.53.2.0\</sqlite3Dir>
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.53.4.0\</sqlite3Dir>
- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.8.1.1\</lzmaDir>
- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
<mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.5.8\</opensslDir>
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.5.8\$(ArchName)\</opensslOutDir>
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.5.9\</opensslDir>
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.5.9\$(ArchName)\</opensslOutDir>
- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0006-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3bd33db3159bcb94e8ce9f7a48ac0df84556a926 Mon Sep 17 00:00:00 2001
From 60582444706c3594dced8ffa4c995b1c026f0feb 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 06/28] Unvendor sqlite3
Expand Down Expand Up @@ -52,7 +52,7 @@ index 09a989d3864..74b961e877f 100644
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
index f12ec348b37..f9e5e449a49 100644
index 0673e03a59f..97a4c46dea1 100644
--- a/PCbuild/sqlite3.vcxproj
+++ b/PCbuild/sqlite3.vcxproj
@@ -88,12 +88,12 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6e76f78cab111f236fe785853e258f512eb35f46 Mon Sep 17 00:00:00 2001
From 0ecdd0d7cccafe5bbd4cd1b739e12d9fc682bf8e 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 07/28] Add CondaEcosystemModifyDllSearchPath()
Expand Down
12 changes: 6 additions & 6 deletions recipe/patches/0008-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c9dc7c03105009a19e1cb5ff2011c0a0a629df23 Mon Sep 17 00:00:00 2001
From 034737d36e140ecde4957b323b00355bac2ac2af 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 08/28] Doing d1trimfile
Expand Down Expand Up @@ -164,7 +164,7 @@ index 3ba49370d58..921d22e47b3 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 46e34a5ea82..fb1589557da 100644
index c102da85e9c..8d5117e804c 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -94,7 +94,11 @@
Expand Down Expand Up @@ -650,7 +650,7 @@ index 75d4e162346..d50534affa1 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index 8a60ee15eb4..6518e0e1b1c 100644
index cf60976266e..91aa7e7bcc3 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -92,6 +92,10 @@
Expand Down Expand Up @@ -753,7 +753,7 @@ index 3f8772d30b4..d80968e351a 100644
<Link>
<AdditionalDependencies>windowsapp.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index e255ed5af19..e2f8f42449a 100644
index d246c910b9c..9026236144d 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -99,7 +99,7 @@
Expand Down Expand Up @@ -854,11 +854,11 @@ index d7448fd4d72..a51c71d2b72 100644
<ItemGroup>
<ClCompile Include="..\Modules\selectmodule.c" />
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
index f9e5e449a49..16ed999655a 100644
index 97a4c46dea1..7d270c3a712 100644
--- a/PCbuild/sqlite3.vcxproj
+++ b/PCbuild/sqlite3.vcxproj
@@ -101,6 +101,10 @@
<PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_PERCENTILE;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level1</WarningLevel>
<AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-unused</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0009-cross-compile-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9b841181c0a1b959571cf68d228f7c26f57aeb00 Mon Sep 17 00:00:00 2001
From e522947fd26f992e906ce80067b509cb07e14681 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 09/28] cross compile darwin
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0010-Fix-TZPATH-on-windows.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a9a2c4ac4a1d090474e3df7537898928c7841970 Mon Sep 17 00:00:00 2001
From 16b2404d97e0a2a5a09d9d7943b6aef5e6f2e29b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 7 Oct 2020 10:08:30 -0500
Subject: [PATCH 10/28] Fix TZPATH on windows
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c0bb28ea8003febd169d7297c315eb958925b3fb Mon Sep 17 00:00:00 2001
From 58bee50e598d18abc841d74102b052dee06084b2 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 25 Jan 2021 03:28:08 -0600
Subject: [PATCH 11/28] Make dyld search work with SYSTEM_VERSION_COMPAT=1
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0012-Unvendor-bzip2.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2ec29cc1dc08eb9b66673791156f934ebbab850e Mon Sep 17 00:00:00 2001
From ebb7c4084ca6bc89e512d96d2d057444305da55c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:56:27 -0700
Subject: [PATCH 12/28] Unvendor bzip2
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0013-Unvendor-libffi.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 83082ba2e827a70616d6ae004330b5971edac912 Mon Sep 17 00:00:00 2001
From 411909b55113d3b07f50c2d927cd7b247f3506fb Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 03:07:40 -0700
Subject: [PATCH 13/28] Unvendor libffi
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0014-Unvendor-tcltk.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d993304749fe79be43f2b79779634d094b37adf6 Mon Sep 17 00:00:00 2001
From 66e5f45333fe6effba089bd6e55cdd4b683a9aac Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 20 Aug 2021 10:23:51 -0700
Subject: [PATCH 14/28] Unvendor tcltk
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0015-unvendor-xz.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1e1c8f160f5fa727b41708c7e05f15bf0610acea Mon Sep 17 00:00:00 2001
From 54e3897771052b39045328958207c38e1c9c4d4b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 25 Sep 2021 10:07:05 -0700
Subject: [PATCH 15/28] unvendor xz
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0016-unvendor-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2ebbbf0c454c154c4b280f1435b522e758e00017 Mon Sep 17 00:00:00 2001
From 98b031c2700f7059d1a92f3e0cf84683d01b7b33 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 29 Sep 2021 15:21:55 -0700
Subject: [PATCH 16/28] unvendor zlib
Expand All @@ -9,7 +9,7 @@ Subject: [PATCH 16/28] unvendor zlib
2 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index e2f8f42449a..7d5432d5428 100644
index 9026236144d..93a0e270a93 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -82,7 +82,7 @@
Expand Down Expand Up @@ -44,7 +44,7 @@ index e2f8f42449a..7d5432d5428 100644
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -711,12 +711,6 @@
@@ -714,12 +714,6 @@
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d264355d5dc63ae4ed78c59ea6ed55b44136895d Mon Sep 17 00:00:00 2001
From fe4a58ba38770c91be8059a36c029bb795bc4547 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 17/28] Do not pass -g to GCC when not Py_DEBUG
Expand Down
36 changes: 22 additions & 14 deletions recipe/patches/0018-Unvendor-expat.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
From 582496505ba2472b09bf0ab16c84c335fb1d1299 Mon Sep 17 00:00:00 2001
From 6d757c6ead828ac2f9d6318de6995c00fa2fb1b8 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 29 Mar 2023 23:07:10 -0500
Subject: [PATCH 18/28] Unvendor expat

---
PCbuild/_elementtree.vcxproj | 26 ++----------
PCbuild/_elementtree.vcxproj.filters | 59 ----------------------------
PCbuild/pyexpat.vcxproj | 14 ++-----
PCbuild/pyexpat.vcxproj.filters | 23 -----------
4 files changed, 8 insertions(+), 114 deletions(-)
PCbuild/_elementtree.vcxproj | 27 ++----------
PCbuild/_elementtree.vcxproj.filters | 62 ----------------------------
PCbuild/pyexpat.vcxproj | 15 ++-----
PCbuild/pyexpat.vcxproj.filters | 26 ------------
4 files changed, 8 insertions(+), 122 deletions(-)

diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index fb1589557da..f47bcd8e4e6 100644
index 8d5117e804c..f47bcd8e4e6 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -93,37 +93,19 @@
@@ -93,38 +93,19 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
Expand All @@ -37,6 +37,7 @@ index fb1589557da..f47bcd8e4e6 100644
- <ClInclude Include="..\Modules\expat\expat_config.h" />
- <ClInclude Include="..\Modules\expat\expat_external.h" />
- <ClInclude Include="..\Modules\expat\fallthrough.h" />
- <ClInclude Include="..\Modules\expat\hash_table.h" />
- <ClInclude Include="..\Modules\expat\iasciitab.h" />
- <ClInclude Include="..\Modules\expat\internal.h" />
- <ClInclude Include="..\Modules\expat\latin1tab.h" />
Expand All @@ -57,10 +58,10 @@ index fb1589557da..f47bcd8e4e6 100644
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
index f6b55d8ff82..88a13faa683 100644
index 9e2e062af3f..88a13faa683 100644
--- a/PCbuild/_elementtree.vcxproj.filters
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -17,69 +17,10 @@
@@ -17,72 +17,10 @@
<UniqueIdentifier>{f99990ba-cd06-40cc-8f28-d2d424ec13be}</UniqueIdentifier>
</Filter>
</ItemGroup>
Expand All @@ -83,6 +84,9 @@ index f6b55d8ff82..88a13faa683 100644
- <ClInclude Include="..\Modules\expat\fallthrough.h">
- <Filter>Header Files\expat</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\hash_table.h">
- <Filter>Header Files\expat</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\iasciitab.h">
- <Filter>Header Files\expat</Filter>
- </ClInclude>
Expand Down Expand Up @@ -131,10 +135,10 @@ index f6b55d8ff82..88a13faa683 100644
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index 6518e0e1b1c..8bc1bcec7e8 100644
index 91aa7e7bcc3..8bc1bcec7e8 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -90,25 +90,19 @@
@@ -90,26 +90,19 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
Expand All @@ -152,6 +156,7 @@ index 6518e0e1b1c..8bc1bcec7e8 100644
</ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="..\Modules\expat\fallthrough.h" />
- <ClInclude Include="..\Modules\expat\hash_table.h" />
- <ClInclude Include="..\Modules\expat\memory_sanitizer.h" />
- <ClInclude Include="..\Modules\expat\xmlrole.h" />
- <ClInclude Include="..\Modules\expat\xmltok.h" />
Expand All @@ -165,17 +170,20 @@ index 6518e0e1b1c..8bc1bcec7e8 100644
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
index 230531033fc..b8280b4049c 100644
index e63cb9c6306..b8280b4049c 100644
--- a/PCbuild/pyexpat.vcxproj.filters
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -11,33 +11,10 @@
@@ -11,36 +11,10 @@
<UniqueIdentifier>{f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4}</UniqueIdentifier>
</Filter>
</ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\Modules\expat\fallthrough.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\hash_table.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\expat\memory_sanitizer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0019-Remove-unused-readelf.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3c035b8b04d7fa837a0912024e22149809f4c600 Mon Sep 17 00:00:00 2001
From 5d0b85ab49e3cfce165ac59d5b283d51f8e26194 Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Thu, 25 May 2023 17:56:53 -0400
Subject: [PATCH 19/28] Remove unused readelf
Expand All @@ -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 8008a96c1c8..5174b36bc53 100644
index 965244d8d2d..f46a928c041 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -38,7 +38,6 @@ CC= @CC@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 008fdd3f752b3fe982568fb1cd64b5ff7e6cb247 Mon Sep 17 00:00:00 2001
From d4d7227aec72cf2aecd80a483e4fe2d6db1ce147 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwe.korn@quantco.com>
Date: Fri, 1 Sep 2023 23:32:14 +0200
Subject: [PATCH 20/28] Don't checksharedmods if cross-compiling
Expand All @@ -10,10 +10,10 @@ Subject: [PATCH 20/28] Don't checksharedmods if cross-compiling
create mode 100755 if_runnable.sh

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5174b36bc53..374c3e7a70d 100644
index f46a928c041..959a60a2545 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1633,7 +1633,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
@@ -1634,7 +1634,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
else \
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info; \
fi
Expand Down
Loading
Loading