mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 16:39:07 +08:00
5599ae4ccf
* [python3] Make patch files contiguous. When applying these back to the python3 repository and re-formatting, the gap in patch file numbers requires annoying manual renaming. Debunk that. * [python3] Use patch files, not diffs. Diffs require multiple steps to import into the python3 repository. Debunk that. The patch format retains authorship information. * [python3] Fix problems with conflicting patches. Something modified in the static library patch was being used as a context line in a later patch. How did this pass CI? * [python3] Bump to 3.10.7. * [python3] Fix Windows 7 patch. * [python3] Back out trivial patch changes. * [python3] Apply unconditional patches first. * version things and stuff * Bump Python tools to 3.10.7.
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 196555707236f4387875749f66620fb519166963 Mon Sep 17 00:00:00 2001
|
|
From: Adam Johnson <AdamJohnso@gmail.com>
|
|
Date: Wed, 9 Sep 2020 15:20:36 -0400
|
|
Subject: [PATCH 2/6] use vcpkg zlib
|
|
|
|
building without zlib is not a supported configuration, per the warning
|
|
messages.
|
|
---
|
|
PCbuild/pythoncore.vcxproj | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
|
|
index dbe236829a..5f30a35eb3 100644
|
|
--- a/PCbuild/pythoncore.vcxproj
|
|
+++ b/PCbuild/pythoncore.vcxproj
|
|
@@ -507,8 +507,10 @@
|
|
<ClCompile Include="..\Python\thread.c" />
|
|
<ClCompile Include="..\Python\traceback.c" />
|
|
</ItemGroup>
|
|
- <ItemGroup Condition="$(IncludeExternals)">
|
|
+ <ItemGroup>
|
|
<ClCompile Include="..\Modules\zlibmodule.c" />
|
|
+ </ItemGroup>
|
|
+ <ItemGroup Condition="false">
|
|
<ClCompile Include="$(zlibDir)\adler32.c" />
|
|
<ClCompile Include="$(zlibDir)\compress.c" />
|
|
<ClCompile Include="$(zlibDir)\crc32.c" />
|
|
@@ -556,7 +558,7 @@
|
|
<Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140' and $(PlatformToolset) != 'v141' and $(PlatformToolset) != 'v142' and $(PlatformToolset) != 'v143'">
|
|
<Warning Text="Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." />
|
|
</Target>
|
|
- <Target Name="_WarnAboutZlib" BeforeTargets="PrepareForBuild" Condition="!$(IncludeExternals)">
|
|
+ <Target Name="_WarnAboutZlib" BeforeTargets="PrepareForBuild" Condition="false">
|
|
<Warning Text="Not including zlib is not a supported configuration." />
|
|
</Target>
|
|
|
|
--
|
|
2.28.0.windows.1
|
|
|