From 1c414f9192e49963c15bd64cdc2eb308cd046194 Mon Sep 17 00:00:00 2001
From: yurybura <yurybura@gmail.com>
Date: Mon, 2 Mar 2020 21:41:27 +0300
Subject: [boost-python] Try to fix build issue on Linux (#9780)

* [boost-python] Try to fix build issue on Linux

* Update baseline: enable boost-python:x64-linux

* Fix number of processor detection on Linux: use CMake module

* Fix user-config.jam configuration on Linux

* Update baseline: enable boost-mpi:x64-linux

* Fix build boost-regex[icu] on Linux, issue #4962
---
 scripts/boost/generate-ports.ps1             |  6 +++---
 scripts/boost/post-source-stubs/python.cmake | 13 ++++++++-----
 scripts/ci.baseline.txt                      |  2 --
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 36ddfe66e..ec32e53fb 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -46,9 +46,9 @@ function Generate()
     $controlDeps = ($Depends | sort) -join ", "
 
     $versionSuffix = ""
-    if ($Name -eq "iostreams")
+    if ($PortName -eq "iostreams" -or $PortName -eq "python")
     {
-        $versionsuffix = "-1"
+        $versionSuffix = "-1"
     }
 
     mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null
@@ -363,7 +363,7 @@ foreach ($library in $libraries)
 
         if ($library -eq "python")
         {
-            $deps += @("python3 (!osx&!linux)")
+            $deps += @("python3")
             $needsBuild = $true
         }
         elseif ($library -eq "iostreams")
diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake
index 5610c489d..5e2ae2b76 100644
--- a/scripts/boost/post-source-stubs/python.cmake
+++ b/scripts/boost/post-source-stubs/python.cmake
@@ -1,5 +1,8 @@
-# Find Python. Can't use find_package here, but we already know where everything is
-file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python3.*")
-set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}")
+# Find Python3 executable
+vcpkg_find_acquire_program(PYTHON3)
+set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
+# Find Python3 libraries. Can't use find_package here, but we already know where everything is
+file(GLOB VCPKG_PYTHON_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
+set(VCPKG_PYTHON_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+set(VCPKG_PYTHON_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON_VERSION "${VCPKG_PYTHON_INCLUDE}")
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 2d51cf546..6c459506b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -171,8 +171,6 @@ boost-locale:arm-uwp=fail
 boost-locale:x64-uwp=fail
 boost-log:arm-uwp=fail
 boost-log:x64-uwp=fail
-boost-python:x64-linux=ignore
-boost-mpi:x64-linux=fail
 boost-mpi:x64-osx=fail
 boost-stacktrace:arm-uwp=fail
 boost-stacktrace:x64-uwp=fail
-- 
cgit v1.2.3