From 24e8be5fcfddd0da98b58a63cd918849787fb06f Mon Sep 17 00:00:00 2001
From: yurybura <yurybura@gmail.com>
Date: Wed, 13 May 2020 20:26:05 +0300
Subject: [boost] update to 1.73.0 (#11221)

* [boost] update to 1.73

* [ompl] remove dependency to boost-disjoint-sets

* [libtorrent] include fixes from RC_1_2 branch

* [liblas] fix boost headers

* [freeopcua] fix std headers

* [pcl] fix build with Boost 1.73.0

* [hpx] fix build with Boost 1.73.0

* [libmysql] fix conflict with C++20 header <version>

* [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake`
[boost-python] support Python2 (fixes #3495)

* [boost-python] remove Python executable from user-config

* [libtorrent] update version after merge

* [libtorrent] add boost-variant dependency
---
 ports/boost-python/CONTROL          |  6 +++++-
 ports/boost-python/b2-options.cmake | 23 +++++++++++++++++++++++
 ports/boost-python/portfile.cmake   | 19 ++++++-------------
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 ports/boost-python/b2-options.cmake

(limited to 'ports/boost-python')

diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL
index b1e0cba23..011f68fcd 100644
--- a/ports/boost-python/CONTROL
+++ b/ports/boost-python/CONTROL
@@ -1,6 +1,10 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-python
-Version: 1.72.0-1
+Version: 1.73.0
 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
 Homepage: https://github.com/boostorg/python
 Description: Boost python module
+
+Feature: python2
+Build-Depends: python2 (windows)
+Description: Build with Python2 support
diff --git a/ports/boost-python/b2-options.cmake b/ports/boost-python/b2-options.cmake
new file mode 100644
index 000000000..5cc0a8da0
--- /dev/null
+++ b/ports/boost-python/b2-options.cmake
@@ -0,0 +1,23 @@
+set(BUILD_PYTHON_VERSIONS)
+
+if("python2" IN_LIST FEATURES)
+    # Find Python2 libraries. Can't use find_package here, but we already know where everything is
+    file(GLOB VCPKG_PYTHON2_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python2.*")
+    set(VCPKG_PYTHON2_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+    set(VCPKG_PYTHON2_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+    string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON2_VERSION "${VCPKG_PYTHON2_INCLUDE}")
+    list(APPEND BUILD_PYTHON_VERSIONS "${VCPKG_PYTHON2_VERSION}")
+endif()
+
+# Find Python3 libraries. Can't use find_package here, but we already know where everything is
+file(GLOB VCPKG_PYTHON3_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
+set(VCPKG_PYTHON3_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+set(VCPKG_PYTHON3_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON3_VERSION "${VCPKG_PYTHON3_INCLUDE}")
+list(APPEND BUILD_PYTHON_VERSIONS "${VCPKG_PYTHON3_VERSION}")
+
+string(REPLACE ";" "," BUILD_PYTHON_VERSIONS "${BUILD_PYTHON_VERSIONS}")
+
+list(APPEND B2_OPTIONS
+    python=${BUILD_PYTHON_VERSIONS}
+)
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index d81d6889c..ee7885d5e 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -1,24 +1,17 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/python
-    REF boost-1.72.0
-    SHA512 9e2214f45b6b7e269caeba3decf2b79df9d1addc711aa65b75273e5fef9ff7423d400e4f11a904f932759b32a5c7e699441961494e061c8dd9c966da1f5b8fef
+    REF boost-1.73.0
+    SHA512 de3523e39814ab6d1bfd69e77983e31f43be16e57c2ad2fe0ff5b67bfcc03ed35ee90a0365acd62c05640e25de223e2885401d03fce62cde47ba3329ada6f495
     HEAD_REF master
 )
 
-# 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}")
 include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
+boost_modular_build(
+    SOURCE_PATH ${SOURCE_PATH}
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+)
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
-- 
cgit v1.2.3