ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/python3/0003-devendor-external-dependencies.patch

   1 From 6c5c3793cbc6ba2a1d0d623a2bdaa9c2125be516 Mon Sep 17 00:00:00 2001
   2 From: Adam Johnson <AdamJohnso@gmail.com>
   3 Date: Wed, 9 Sep 2020 15:24:38 -0400
   4 Subject: [PATCH 3/6] devendor external dependencies
   5
   6 externally fetched libraries may cause linker errors resulting from
   7 duplicate symbols in downstream projects.
   8 ---
   9  PCbuild/_bz2.vcxproj     | 4 +++-
  10  PCbuild/_lzma.vcxproj    | 5 ++---
  11  PCbuild/_sqlite3.vcxproj | 2 +-
  12  PCbuild/_ssl.vcxproj     | 2 +-
  13  PCbuild/pyexpat.vcxproj  | 6 ++++--
  14  5 files changed, 11 insertions(+), 8 deletions(-)
  15
  16 diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj
  17 index 3fe95fbf83..6b12e8818e 100644
  18 --- a/PCbuild/_bz2.vcxproj
  19 +++ b/PCbuild/_bz2.vcxproj
  20 @@ -101,6 +101,8 @@
  21    </ItemDefinitionGroup>
  22    <ItemGroup>
  23      <ClCompile Include="..\Modules\_bz2module.c" />
  24 +  </ItemGroup>
  25 +  <ItemGroup Condition="false">
  26      <ClCompile Include="$(bz2Dir)\blocksort.c" />
  27      <ClCompile Include="$(bz2Dir)\bzlib.c" />
  28      <ClCompile Include="$(bz2Dir)\compress.c" />
  29 @@ -109,7 +111,7 @@
  30      <ClCompile Include="$(bz2Dir)\huffman.c" />
  31      <ClCompile Include="$(bz2Dir)\randtable.c" />
  32    </ItemGroup>
  33 -  <ItemGroup>
  34 +  <ItemGroup Condition="false">
  35      <ClInclude Include="$(bz2Dir)\bzlib.h" />
  36      <ClInclude Include="$(bz2Dir)\bzlib_private.h" />
  37    </ItemGroup>
  38 diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj
  39 index fe076a6fc5..70cc61dd95 100644
  40 --- a/PCbuild/_lzma.vcxproj
  41 +++ b/PCbuild/_lzma.vcxproj
  42 @@ -94,10 +94,9 @@
  43    <ItemDefinitionGroup>
  44      <ClCompile>
  45        <AdditionalIncludeDirectories>$(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  46 -      <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  47 +      <PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  48      </ClCompile>
  49      <Link>
  50 -      <AdditionalDependencies>$(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
  51      </Link>
  52    </ItemDefinitionGroup>
  53    <ItemGroup>
  54 @@ -111,7 +110,7 @@
  55        <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
  56        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
  57      </ProjectReference>
  58 -    <ProjectReference Include="liblzma.vcxproj">
  59 +    <ProjectReference Condition="false" Include="liblzma.vcxproj">
  60        <Project>{12728250-16eC-4dc6-94d7-e21dd88947f8}</Project>
  61        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
  62      </ProjectReference>
  63 diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
  64 index 7e0062692b..6fb3279a20 100644
  65 --- a/PCbuild/_sqlite3.vcxproj
  66 +++ b/PCbuild/_sqlite3.vcxproj
  67 @@ -127,7 +127,7 @@
  68        <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
  69        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
  70      </ProjectReference>
  71 -    <ProjectReference Include="sqlite3.vcxproj">
  72 +    <ProjectReference Condition="false" Include="sqlite3.vcxproj">
  73        <Project>{a1a295e5-463c-437f-81ca-1f32367685da}</Project>
  74        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
  75      </ProjectReference>
  76 diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
  77 index 4907f49b66..4dffa202b7 100644
  78 --- a/PCbuild/_ssl.vcxproj
  79 +++ b/PCbuild/_ssl.vcxproj
  80 @@ -99,7 +99,7 @@
  81    </ItemDefinitionGroup>
  82    <ItemGroup>
  83      <ClCompile Include="..\Modules\_ssl.c" />
  84 -    <ClCompile Include="$(opensslIncludeDir)\applink.c">
  85 +    <ClCompile Condition="false" Include="$(opensslIncludeDir)\applink.c">
  86        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions>
  87      </ClCompile>
  88    </ItemGroup>
  89 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
  90 index b2d9f5d57d..4efb826a05 100644
  91 --- a/PCbuild/pyexpat.vcxproj
  92 +++ b/PCbuild/pyexpat.vcxproj
  93 @@ -89,17 +89,19 @@
  94    </ImportGroup>
  95    <PropertyGroup Label="UserMacros" />
  96    <ItemDefinitionGroup>
  97 -    <ClCompile>
  98 +    <ClCompile Condition="false">
  99        <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 100        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 101      </ClCompile>
 102    </ItemDefinitionGroup>
 103 -  <ItemGroup>
 104 +  <ItemGroup Condition="false">
 105      <ClInclude Include="..\Modules\expat\xmlrole.h" />
 106      <ClInclude Include="..\Modules\expat\xmltok.h" />
 107    </ItemGroup>
 108    <ItemGroup>
 109      <ClCompile Include="..\Modules\pyexpat.c" />
 110 +  </ItemGroup>
 111 +  <ItemGroup Condition="false">
 112      <ClCompile Include="..\Modules\expat\xmlparse.c" />
 113      <ClCompile Include="..\Modules\expat\xmlrole.c" />
 114      <ClCompile Include="..\Modules\expat\xmltok.c" />
 115 --
 116 2.28.0.windows.1
 117