From 8e3c3042698066a7336bc26f8c88391bcaddefb2 Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Tue, 14 Jul 2020 11:43:02 -0400
Subject: [PATCH] [python3] Fix building x86-windows-static triplet on VS 2017.
 (#12412)

---
 ports/python3/0001-static-library.patch | 23 ++++++++++++++++++++---
 ports/python3/0002-static-crt.patch     |  2 +-
 ports/python3/CONTROL                   |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch
index 46502130db..d9d6024d0d 100644
--- a/ports/python3/0001-static-library.patch
+++ b/ports/python3/0001-static-library.patch
@@ -1,5 +1,5 @@
 diff --git a/PC/pyconfig.h b/PC/pyconfig.h
-index b6b8d44586..35b329f307 100644
+index b6b8d445869bc..35b329f307c12 100644
 --- a/PC/pyconfig.h
 +++ b/PC/pyconfig.h
 @@ -257,6 +257,7 @@ typedef int pid_t;
@@ -23,7 +23,7 @@ index b6b8d44586..35b329f307 100644
  
  #if defined(MS_WIN64)
 diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index 0666b90f66..eb5ecffe71 100644
+index 0666b90f66cc9..ca83b82d8a0fe 100644
 --- a/PCbuild/pythoncore.vcxproj
 +++ b/PCbuild/pythoncore.vcxproj
 @@ -73,7 +73,7 @@
@@ -35,7 +35,7 @@ index 0666b90f66..eb5ecffe71 100644
      <UseOfMfc>false</UseOfMfc>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -102,7 +102,7 @@
+@@ -102,12 +102,24 @@
        <AdditionalOptions>/Zm200  %(AdditionalOptions)</AdditionalOptions>
        <AdditionalIncludeDirectories>$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(zlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -44,3 +44,20 @@ index 0666b90f66..eb5ecffe71 100644
        <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      </ClCompile>
      <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" />
diff --git a/ports/python3/0002-static-crt.patch b/ports/python3/0002-static-crt.patch
index 82e2b36d27..362610f38c 100644
--- a/ports/python3/0002-static-crt.patch
+++ b/ports/python3/0002-static-crt.patch
@@ -1,5 +1,5 @@
 diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index eb5ecffe71..2a7c819533 100644
+index ca83b82d8a0fe..b925a26a96e5e 100644
 --- a/PCbuild/pythoncore.vcxproj
 +++ b/PCbuild/pythoncore.vcxproj
 @@ -104,6 +104,10 @@
diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL
index abb7bf23af..2df8d9472f 100644
--- a/ports/python3/CONTROL
+++ b/ports/python3/CONTROL
@@ -1,5 +1,6 @@
 Source: python3
 Version: 3.8.3
+Port-Version: 1
 Homepage: https://github.com/python/cpython
 Description: The Python programming language as an embeddable library
 Build-Depends: libffi, openssl, zlib (!uwp&!windows)