diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2020-04-16 20:57:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 11:57:59 -0700 |
| commit | 614ac279daab9cf7f36083a86fbc6395ca732df1 (patch) | |
| tree | 53fa32263401797792bbc0e3ff57b9d12cd2790e /ports/python3 | |
| parent | 0e9ad65548577118d3e31caf5cd65656ab84a48f (diff) | |
| download | vcpkg-614ac279daab9cf7f36083a86fbc6395ca732df1.tar.gz vcpkg-614ac279daab9cf7f36083a86fbc6395ca732df1.zip | |
[python3] fix build on macOS and linux (#10841)
* [python3] fix build on macOS and linux
* update ci baseline
Diffstat (limited to 'ports/python3')
| -rw-r--r-- | ports/python3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/python3/portfile.cmake | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL index 074641ea8..602c42355 100644 --- a/ports/python3/CONTROL +++ b/ports/python3/CONTROL @@ -1,5 +1,5 @@ Source: python3 -Version: 3.7.3-1 +Version: 3.7.3-2 Homepage: https://github.com/python/cpython Description: The Python programming language as an embeddable library Build-Depends: libffi, openssl diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index dc9e0efa3..44fe20fd2 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -139,19 +139,12 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( - COMMAND make -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make + COMMAND make install -j ${VCPKG_CONCURRENCY} + NO_PARALLEL_COMMAND make install WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} LOGNAME make-build-${TARGET_TRIPLET}-release ) - message(STATUS "Installing ${TARGET_TRIPLET}-rel") - vcpkg_execute_build_process( - COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME make-install-${TARGET_TRIPLET}-release - ) - message(STATUS "Installing ${TARGET_TRIPLET}-rel headers...") file(GLOB HEADERS ${OUT_PATH_RELEASE}/include/*) @@ -223,19 +216,12 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( - COMMAND make -j ${VCPKG_CONCURRENCY} - NO_PARALLEL_COMMAND make + COMMAND make install -j ${VCPKG_CONCURRENCY} + NO_PARALLEL_COMMAND make install WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} LOGNAME make-build-${TARGET_TRIPLET}-debug ) - message(STATUS "Installing ${TARGET_TRIPLET}-dbg") - vcpkg_execute_build_process( - COMMAND make install - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME make-install-${TARGET_TRIPLET}-debug - ) - message(STATUS "Installing ${TARGET_TRIPLET}-dbg Python library files...") file(GLOB LIBS ${OUT_PATH_DEBUG}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}dm.*) |