From 614ac279daab9cf7f36083a86fbc6395ca732df1 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Thu, 16 Apr 2020 20:57:59 +0200
Subject: [python3] fix build on macOS and linux (#10841)

* [python3] fix build on macOS and linux

* update ci baseline
---
 ports/python3/CONTROL        |  2 +-
 ports/python3/portfile.cmake | 22 ++++------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'ports/python3')

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.*)
-- 
cgit v1.2.3