diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/python2 | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/python2')
| -rw-r--r-- | ports/python2/CONTROL | 4 | ||||
| -rw-r--r-- | ports/python2/portfile.cmake | 26 |
2 files changed, 14 insertions, 16 deletions
diff --git a/ports/python2/CONTROL b/ports/python2/CONTROL index c0510dcac..4b03ff8cf 100644 --- a/ports/python2/CONTROL +++ b/ports/python2/CONTROL @@ -1,3 +1,3 @@ Source: python2 -Version: 2.7.15-1 -Description: The Python programming language as an embeddable library
\ No newline at end of file +Version: 2.7.15-2 +Description: The Python programming language as an embeddable library diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake index 0c53ec128..ea11b33b5 100644 --- a/ports/python2/portfile.cmake +++ b/ports/python2/portfile.cmake @@ -1,4 +1,4 @@ -# Patches are from: +# Patches are from: # - https://github.com/python-cmake-buildsystem/python-cmake-buildsystem/tree/master/patches/2.7.13/Windows-MSVC/1900 # - https://github.com/Microsoft/vcpkg/tree/master/ports/python3 @@ -11,21 +11,10 @@ set(PYTHON_VERSION_MAJOR 2) set(PYTHON_VERSION_MINOR 7) set(PYTHON_VERSION_PATCH 15) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/python-${PYTHON_VERSION}) include(vcpkg_common_functions) -vcpkg_download_distfile( - PYTHON_ARCHIVE - URLS https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz - FILENAME Python-${PYTHON_VERSION}.tar.xz - SHA512 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 -) - -vcpkg_extract_source_archive(${PYTHON_ARCHIVE}) - set(_PYTHON_PATCHES "") - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/004-static-library-msvc.patch @@ -36,8 +25,17 @@ if (VCPKG_CRT_LINKAGE STREQUAL static) list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/005-static-crt-msvc.patch) endif() -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} + +vcpkg_download_distfile(ARCHIVE + URLS https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz + FILENAME Python-${PYTHON_VERSION}.tar.xz + SHA512 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-build-msvc.patch ${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch |