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

Fix for python3 compile, fixes issue 3715 (#3827)

Browse Source 
* Fix for python3 compile, fixes issue 3715

* [python3] Use PATCHES of vcpkg_from_github
This commit is contained in:
Miodrag Milanović 2018-07-03 09:59:02 +02:00 committed by Robert Schumacher
parent 67d6200cdb
commit 1459dbfa51
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/python3/0005-Fix-DefaultWindowsSDKVersion.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/PCbuild/python.props b/PCbuild/python.props
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -76,7 +76,7 @@
-->
<_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
<_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
- <DefaultWindowsSDKVersion>10.0.15063.0</DefaultWindowsSDKVersion>
+ <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>

2
ports/python3/CONTROL
View File

@ -1,3 +1,3 @@
Source: python3
Version: 3.6.4-1
Version: 3.6.4-2
Description: The Python programming language as an embeddable library

5
ports/python3/portfile.cmake
View File

@ -16,12 +16,9 @@ vcpkg_from_github(
REF v${PYTHON_VERSION}
SHA512 32cca5e344ee66f08712ab5533e5518f724f978ec98d985f7612d0bd8d7f5cac25625363c9eead192faf1806d4ea3393515f72ba962a2a0bed26261e56d8c637
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${TEMP_SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0004-Fix-iomodule-for-RS4-SDK.patch
${CMAKE_CURRENT_LIST_DIR}/0005-Fix-DefaultWindowsSDKVersion.patch
)
# We need per-triplet directories because we need to patch the project files differently based on the linkage