mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 12:47:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[python3] Fix building x86-windows-static triplet on VS 2017. (#12412)

Browse Source
This commit is contained in:
Adam Johnson 2020-07-14 11:43:02 -04:00 committed by GitHub
parent 5e40afca0d
commit 8e3c304269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/python3/0001-static-library.patch
View File

@ -1,5 +1,5 @@
diff --git a/PC/pyconfig.h b/PC/pyconfig.h diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index b6b8d44586..35b329f307 100644 index b6b8d445869bc..35b329f307c12 100644
--- a/PC/pyconfig.h --- a/PC/pyconfig.h
+++ b/PC/pyconfig.h +++ b/PC/pyconfig.h
@@ -257,6 +257,7 @@ typedef int pid_t; @@ -257,6 +257,7 @@ typedef int pid_t;
@ -23,7 +23,7 @@ index b6b8d44586..35b329f307 100644
#if defined(MS_WIN64) #if defined(MS_WIN64)
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 0666b90f66..eb5ecffe71 100644 index 0666b90f66cc9..ca83b82d8a0fe 100644
--- a/PCbuild/pythoncore.vcxproj --- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
@ -35,7 +35,7 @@ index 0666b90f66..eb5ecffe71 100644
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -102,7 +102,7 @@ @@ -102,12 +102,24 @@
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(zlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(zlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -44,3 +44,20 @@ index 0666b90f66..eb5ecffe71 100644
<PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
+ <Lib>
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MachineX86</TargetMachine>
+ </Lib>
+ <Lib>
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MachineX86</TargetMachine>
+ </Lib>
+ <Lib>
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MachineX86</TargetMachine>
+ </Lib>
+ <Lib>
+ <TargetMachine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MachineX86</TargetMachine>
+ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Include\abstract.h" />

2
ports/python3/0002-static-crt.patch
View File

@ -1,5 +1,5 @@
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index eb5ecffe71..2a7c819533 100644 index ca83b82d8a0fe..b925a26a96e5e 100644
--- a/PCbuild/pythoncore.vcxproj --- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj
@@ -104,6 +104,10 @@ @@ -104,6 +104,10 @@

1
ports/python3/CONTROL
View File

@ -1,5 +1,6 @@
Source: python3 Source: python3
Version: 3.8.3 Version: 3.8.3
Port-Version: 1
Homepage: https://github.com/python/cpython Homepage: https://github.com/python/cpython
Description: The Python programming language as an embeddable library Description: The Python programming language as an embeddable library
Build-Depends: libffi, openssl, zlib (!uwp&!windows) Build-Depends: libffi, openssl, zlib (!uwp&!windows)