diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-08-29 15:59:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 15:59:03 -0700 |
| commit | 344df1f4d957a883506421d06ee96376cd3f37cd (patch) | |
| tree | 4ff48f3a1817d52814f4bd5596ad468a23093203 | |
| parent | 0c5b3ae2257da1f329e32a2260a1d11b03d9fd72 (diff) | |
| parent | 9369f4267172220f4ce65fa3519a3350e6c7f4d1 (diff) | |
| download | vcpkg-344df1f4d957a883506421d06ee96376cd3f37cd.tar.gz vcpkg-344df1f4d957a883506421d06ee96376cd3f37cd.zip | |
Merge pull request #4184 from TheAifam5/fix/python2/build-path
Fix build path for win-x86 platform
| -rw-r--r-- | ports/python2/007-fix-build-path.patch | 14 | ||||
| -rw-r--r-- | ports/python2/portfile.cmake | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ports/python2/007-fix-build-path.patch b/ports/python2/007-fix-build-path.patch new file mode 100644 index 000000000..5dc4633e0 --- /dev/null +++ b/ports/python2/007-fix-build-path.patch @@ -0,0 +1,14 @@ +diff --git a/PCbuild/python.props b/PCbuild/python.props
+index d2b1991..a22c054 100644
+--- a/PCbuild/python.props
++++ b/PCbuild/python.props
+@@ -26,8 +26,7 @@
+ <PySourcePath Condition="!HasTrailingSlash($(PySourcePath))">$(PySourcePath)\</PySourcePath>
+
+ <!-- Directory where build outputs are put -->
+- <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\</BuildPath>
+- <BuildPath Condition="'$(ArchName)' != 'win32'">$(BuildPath)\$(ArchName)\</BuildPath>
++ <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath>
+ <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath>
+
+ <!-- Directories of external projects. tcltk is handled in tcltk.props -->
diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake index c21b1f1e6..0c53ec128 100644 --- a/ports/python2/portfile.cmake +++ b/ports/python2/portfile.cmake @@ -43,6 +43,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch ${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch ${_PYTHON_PATCHES} + ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch ) if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") |