From 660745956a59f58bc95b1802b2d08ddaeff37eb7 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 25 Jan 2019 18:11:08 -0800
Subject: [boost][python3] Fix building with VS 2019

---
 ports/python3/CONTROL                                   |  2 +-
 ...rosoft.VisualStudio.Setup.Configuration.Native.patch | 13 +++++++++++++
 ports/python3/dev16.patch                               | 17 +++++++++++++++++
 ports/python3/portfile.cmake                            |  2 ++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch
 create mode 100644 ports/python3/dev16.patch

(limited to 'ports/python3')

diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL
index 26a0bce93..6c5a835da 100644
--- a/ports/python3/CONTROL
+++ b/ports/python3/CONTROL
@@ -1,3 +1,3 @@
 Source: python3
-Version: 3.6.4-2
+Version: 3.6.4-3
 Description: The Python programming language as an embeddable library
\ No newline at end of file
diff --git a/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch b/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch
new file mode 100644
index 000000000..50b728340
--- /dev/null
+++ b/ports/python3/Microsoft.VisualStudio.Setup.Configuration.Native.patch
@@ -0,0 +1,13 @@
+diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
+index 0f01852..6e63711 100644
+--- a/PCbuild/pythoncore.vcxproj
++++ b/PCbuild/pythoncore.vcxproj
+@@ -71,7 +71,7 @@
+     </ClCompile>
+     <Link>
+       <AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\v140\$(ArchName)</AdditionalLibraryDirectories>
+       <BaseAddress>0x1e000000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
diff --git a/ports/python3/dev16.patch b/ports/python3/dev16.patch
new file mode 100644
index 000000000..38a968729
--- /dev/null
+++ b/ports/python3/dev16.patch
@@ -0,0 +1,17 @@
+diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
+index 9a096bc..0647cf8 100644
+--- a/PCbuild/pyproject.props
++++ b/PCbuild/pyproject.props
+@@ -94,9 +94,9 @@
+           Inputs="$(PySourcePath)Include\patchlevel.h"
+           Outputs="$(IntDir)pythonnt_rc.h">
+     <WriteLinesToFile File="$(IntDir)pythonnt_rc.h" Overwrite="true" Encoding="ascii"
+-                      Lines='/* This file created by pyproject.props /t:GeneratePythonNtRcH */
+-#define FIELD3 $(Field3Value)
+-#define MS_DLL_ID "$(SysWinVer)"
++                      Lines='/* This file created by pyproject.props /t:GeneratePythonNtRcH */;
++#define FIELD3 $(Field3Value);
++#define MS_DLL_ID "$(SysWinVer)";
+ #define PYTHON_DLL_NAME "$(TargetName)$(TargetExt)"
+ ' />
+     <ItemGroup>
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index 576a35e8a..e3bbfd2f5 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -19,6 +19,8 @@ vcpkg_from_github(
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-iomodule-for-RS4-SDK.patch
         ${CMAKE_CURRENT_LIST_DIR}/0005-Fix-DefaultWindowsSDKVersion.patch
+        dev16.patch
+        Microsoft.VisualStudio.Setup.Configuration.Native.patch
 )
 
 # We need per-triplet directories because we need to patch the project files differently based on the linkage
-- 
cgit v1.2.3