diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2020-12-18 15:00:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 12:00:45 -0800 |
| commit | bdb225bc6890ac507175fe2623d7665936335781 (patch) | |
| tree | 6b42b6d8b2930d329e0604645f2a60687621815c /ports/python3/0004-dont-copy-vcruntime.patch | |
| parent | e1417916bc1ed24bacd9cbc54bd42a99f996f618 (diff) | |
| download | vcpkg-bdb225bc6890ac507175fe2623d7665936335781.tar.gz vcpkg-bdb225bc6890ac507175fe2623d7665936335781.zip | |
[python3] Build interpreter (#14891)
Diffstat (limited to 'ports/python3/0004-dont-copy-vcruntime.patch')
| -rw-r--r-- | ports/python3/0004-dont-copy-vcruntime.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ports/python3/0004-dont-copy-vcruntime.patch b/ports/python3/0004-dont-copy-vcruntime.patch new file mode 100644 index 000000000..174c27e5c --- /dev/null +++ b/ports/python3/0004-dont-copy-vcruntime.patch @@ -0,0 +1,26 @@ +From 8086c67fa7ada1888a7808cbdc6fe74b62abe5b1 Mon Sep 17 00:00:00 2001 +From: Adam Johnson <AdamJohnso@gmail.com> +Date: Wed, 9 Sep 2020 16:12:49 -0400 +Subject: [PATCH 4/6] dont copy vcruntime + +VCRUNTIME140.dll should not be redistributed, ever. +--- + PCbuild/pythoncore.vcxproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 5f30a35eb3..3cf21ba39c 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -565,7 +565,7 @@ + <Target Name="_CopyVCRuntime" AfterTargets="Build" Inputs="@(VCRuntimeDLL)" Outputs="$(OutDir)%(Filename)%(Extension)" DependsOnTargets="FindVCRuntime"> + <!-- bpo-38597: When we switch to another VCRuntime DLL, include vcruntime140.dll as well --> + <Warning Text="A copy of vcruntime140.dll is also required" Condition="!$(VCToolsRedistVersion.StartsWith(`14.`))" /> +- <Copy SourceFiles="%(VCRuntimeDLL.FullPath)" DestinationFolder="$(OutDir)" /> ++ <Copy Condition="false" SourceFiles="%(VCRuntimeDLL.FullPath)" DestinationFolder="$(OutDir)" /> + </Target> + <Target Name="_CleanVCRuntime" AfterTargets="Clean"> + <Delete Files="@(VCRuntimeDLL->'$(OutDir)%(Filename)%(Extension)')" /> +-- +2.28.0.windows.1 + |