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/0003-devendor-external-dependencies.patch | |
| parent | e1417916bc1ed24bacd9cbc54bd42a99f996f618 (diff) | |
| download | vcpkg-bdb225bc6890ac507175fe2623d7665936335781.tar.gz vcpkg-bdb225bc6890ac507175fe2623d7665936335781.zip | |
[python3] Build interpreter (#14891)
Diffstat (limited to 'ports/python3/0003-devendor-external-dependencies.patch')
| -rw-r--r-- | ports/python3/0003-devendor-external-dependencies.patch | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/ports/python3/0003-devendor-external-dependencies.patch b/ports/python3/0003-devendor-external-dependencies.patch new file mode 100644 index 000000000..25e3a1489 --- /dev/null +++ b/ports/python3/0003-devendor-external-dependencies.patch @@ -0,0 +1,117 @@ +From 6c5c3793cbc6ba2a1d0d623a2bdaa9c2125be516 Mon Sep 17 00:00:00 2001 +From: Adam Johnson <AdamJohnso@gmail.com> +Date: Wed, 9 Sep 2020 15:24:38 -0400 +Subject: [PATCH 3/6] devendor external dependencies + +externally fetched libraries may cause linker errors resulting from +duplicate symbols in downstream projects. +--- + PCbuild/_bz2.vcxproj | 4 +++- + PCbuild/_lzma.vcxproj | 5 ++--- + PCbuild/_sqlite3.vcxproj | 2 +- + PCbuild/_ssl.vcxproj | 2 +- + PCbuild/pyexpat.vcxproj | 6 ++++-- + 5 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj +index 3fe95fbf83..6b12e8818e 100644 +--- a/PCbuild/_bz2.vcxproj ++++ b/PCbuild/_bz2.vcxproj +@@ -101,6 +101,8 @@ + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\Modules\_bz2module.c" /> ++ </ItemGroup> ++ <ItemGroup Condition="false"> + <ClCompile Include="$(bz2Dir)\blocksort.c" /> + <ClCompile Include="$(bz2Dir)\bzlib.c" /> + <ClCompile Include="$(bz2Dir)\compress.c" /> +@@ -109,7 +111,7 @@ + <ClCompile Include="$(bz2Dir)\huffman.c" /> + <ClCompile Include="$(bz2Dir)\randtable.c" /> + </ItemGroup> +- <ItemGroup> ++ <ItemGroup Condition="false"> + <ClInclude Include="$(bz2Dir)\bzlib.h" /> + <ClInclude Include="$(bz2Dir)\bzlib_private.h" /> + </ItemGroup> +diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj +index fe076a6fc5..70cc61dd95 100644 +--- a/PCbuild/_lzma.vcxproj ++++ b/PCbuild/_lzma.vcxproj +@@ -94,10 +94,9 @@ + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>$(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> +- <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> +- <AdditionalDependencies>$(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> +@@ -111,7 +110,7 @@ + <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> +- <ProjectReference Include="liblzma.vcxproj"> ++ <ProjectReference Condition="false" Include="liblzma.vcxproj"> + <Project>{12728250-16eC-4dc6-94d7-e21dd88947f8}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> +diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj +index 7e0062692b..6fb3279a20 100644 +--- a/PCbuild/_sqlite3.vcxproj ++++ b/PCbuild/_sqlite3.vcxproj +@@ -127,7 +127,7 @@ + <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> +- <ProjectReference Include="sqlite3.vcxproj"> ++ <ProjectReference Condition="false" Include="sqlite3.vcxproj"> + <Project>{a1a295e5-463c-437f-81ca-1f32367685da}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> +diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj +index 4907f49b66..4dffa202b7 100644 +--- a/PCbuild/_ssl.vcxproj ++++ b/PCbuild/_ssl.vcxproj +@@ -99,7 +99,7 @@ + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\Modules\_ssl.c" /> +- <ClCompile Include="$(opensslIncludeDir)\applink.c"> ++ <ClCompile Condition="false" Include="$(opensslIncludeDir)\applink.c"> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemGroup> +diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj +index b2d9f5d57d..4efb826a05 100644 +--- a/PCbuild/pyexpat.vcxproj ++++ b/PCbuild/pyexpat.vcxproj +@@ -89,17 +89,19 @@ + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup> +- <ClCompile> ++ <ClCompile Condition="false"> + <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemDefinitionGroup> +- <ItemGroup> ++ <ItemGroup Condition="false"> + <ClInclude Include="..\Modules\expat\xmlrole.h" /> + <ClInclude Include="..\Modules\expat\xmltok.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\Modules\pyexpat.c" /> ++ </ItemGroup> ++ <ItemGroup Condition="false"> + <ClCompile Include="..\Modules\expat\xmlparse.c" /> + <ClCompile Include="..\Modules\expat\xmlrole.c" /> + <ClCompile Include="..\Modules\expat\xmltok.c" /> +-- +2.28.0.windows.1 + |
