diff options
| -rw-r--r-- | ports/python3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/python3/portfile.cmake | 22 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
3 files changed, 5 insertions, 21 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.*) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 17239f534..dc74d5e90 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -161,7 +161,6 @@ boost-locale:arm-uwp=fail boost-locale:x64-uwp=fail
boost-log:arm-uwp=fail
boost-log:x64-uwp=fail
-boost-mpi:x64-osx=fail
boost-stacktrace:arm-uwp=fail
boost-stacktrace:x64-uwp=fail
boost-test:arm-uwp=fail
@@ -1452,7 +1451,6 @@ python2:x64-osx=fail python2:x64-uwp=fail
python3:arm64-windows=fail
python3:arm-uwp=fail
-python3:x64-osx=fail
python3:x64-uwp=fail
qca:x64-linux=fail
qca:x64-osx=fail
|