[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

5 files changed, 55 insertions, 57 deletions

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index 23a0de50f..ef33db882 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -10,6 +10,7 @@ set(VCPKG_PLATFORM_TOOLSET external)
 set(B2_OPTIONS)

 

 if(DEFINED BOOST_CMAKE_FRAGMENT)

+    message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}")

     include(${BOOST_CMAKE_FRAGMENT})

 endif()

 

diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index b3a955924..926524085 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,2 @@
 Source: boost-modular-build-helper

-Version: 1.72.0-2

+Version: 1.73.0

diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam
index 688303b19..884284b49 100644
--- a/ports/boost-modular-build-helper/Jamroot.jam
+++ b/ports/boost-modular-build-helper/Jamroot.jam
@@ -1,5 +1,5 @@
-constant BOOST_VERSION : 1.72.0 ;

-constant BOOST_VERSION_ABI_TAG : 1_72 ;

+constant BOOST_VERSION : 1.73.0 ;

+constant BOOST_VERSION_ABI_TAG : 1_73 ;

 constant BOOST_JAMROOT_MODULE : $(__name__) ;

 

 import boostcpp ;

@@ -11,7 +11,7 @@ project boost : requirements
     <include>include&&"@CURRENT_INSTALLED_DIR@/include"

     <define>BOOST_ALL_NO_LIB=1

     <tag>@$(__name__).tag

-    @REQUIREMENTS@

+    @B2_REQUIREMENTS@

     ;

 

 rule boost-install ( libraries * )

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 765d882b8..d166a35ca 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -1,9 +1,20 @@
 function(boost_modular_build)

-    cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS;BOOST_CMAKE_FRAGMENT" "OPTIONS" ${ARGN})

+    cmake_parse_arguments(_bm "" "SOURCE_PATH;BOOST_CMAKE_FRAGMENT" "" ${ARGN})

 

     if(NOT DEFINED _bm_SOURCE_PATH)

         message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.")

     endif()

+    

+    # Next CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT}

+    set(B2_OPTIONS)

+    set(B2_OPTIONS_DBG)

+    set(B2_OPTIONS_REL)

+    set(B2_REQUIREMENTS) # this variable is used in the Jamroot.jam

+

+    if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)

+        message(STATUS "Including ${_bm_BOOST_CMAKE_FRAGMENT}")

+        include(${_bm_BOOST_CMAKE_FRAGMENT})

+    endif()

 

     # Todo: this serves too similar a purpose as vcpkg_find_acquire_program()

     if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

@@ -17,11 +28,11 @@ function(boost_modular_build)
     endif()

 

     if(NOT EXISTS "${BOOST_BUILD_PATH}")

-	if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

+        if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

             message(FATAL_ERROR "The x64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:x64-linux`.") 

-	else()

+        else()

             message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")

-	endif()

+        endif()

     endif()

 

     if(EXISTS "${BOOST_BUILD_PATH}/b2.exe")

@@ -33,13 +44,11 @@ function(boost_modular_build)
     endif()

 

     if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-        list(APPEND _bm_OPTIONS windows-api=store)

+        list(APPEND B2_OPTIONS windows-api=store)

     endif()

 

     set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-build)

 

-    set(REQUIREMENTS ${_bm_REQUIREMENTS})

-

     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

         set(BOOST_LIB_PREFIX)

         set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib)

@@ -85,26 +94,12 @@ function(boost_modular_build)
         if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)

             list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")

         endif()

-        if(DEFINED VCPKG_PYTHON_EXECUTABLE)

-            list(APPEND configure_option "-DVCPKG_PYTHON_EXECUTABLE=${VCPKG_PYTHON_EXECUTABLE}")

-        endif()

-        if(DEFINED VCPKG_PYTHON_INCLUDE)

-            list(APPEND configure_option "-DVCPKG_PYTHON_INCLUDE=${VCPKG_PYTHON_INCLUDE}")

-        endif()

-        if(DEFINED VCPKG_PYTHON_LIBS_RELEASE)

-            list(APPEND configure_option "-DVCPKG_PYTHON_LIBS_RELEASE=${VCPKG_PYTHON_LIBS_RELEASE}")

-        endif()

-        if(DEFINED VCPKG_PYTHON_LIBS_DEBUG)

-            list(APPEND configure_option "-DVCPKG_PYTHON_LIBS_DEBUG=${VCPKG_PYTHON_LIBS_DEBUG}")

-        endif()

-        if(DEFINED VCPKG_PYTHON_VERSION)

-            list(APPEND configure_option "-DVCPKG_PYTHON_VERSION=${VCPKG_PYTHON_VERSION}")

-        endif()

         vcpkg_configure_cmake(

             SOURCE_PATH ${CURRENT_INSTALLED_DIR}/share/boost-build

             PREFER_NINJA

             OPTIONS

                 "-DPORT=${PORT}"

+                "-DFEATURES=${FEATURES}"

                 "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}"

                 "-DB2_EXE=${B2_EXE}"

                 "-DSOURCE_PATH=${_bm_SOURCE_PATH}"

@@ -159,7 +154,7 @@ function(boost_modular_build)
     ######################

     # Generate configuration

     ######################

-    list(APPEND _bm_OPTIONS

+    list(APPEND B2_OPTIONS

         -j${NUMBER_OF_PROCESSORS}

         --debug-configuration

         --debug-building

@@ -175,11 +170,11 @@ function(boost_modular_build)
         threading=multi

     )

     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-        list(APPEND _bm_OPTIONS threadapi=win32)

+        list(APPEND B2_OPTIONS threadapi=win32)

     else()

-        list(APPEND _bm_OPTIONS threadapi=pthread)

+        list(APPEND B2_OPTIONS threadapi=pthread)

     endif()

-    set(_bm_OPTIONS_DBG

+    set(B2_OPTIONS_DBG

          -sZLIB_BINARY=zlibd

          "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"

          -sBZIP2_BINARY=bz2d

@@ -190,7 +185,7 @@ function(boost_modular_build)
          "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"

     )

  

-    set(_bm_OPTIONS_REL

+    set(B2_OPTIONS_REL

          -sZLIB_BINARY=zlib

          "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"

          -sBZIP2_BINARY=bz2

@@ -203,62 +198,62 @@ function(boost_modular_build)
 

     # Properly handle compiler and linker flags passed by VCPKG

     if(VCPKG_CXX_FLAGS)

-        list(APPEND _bm_OPTIONS "cxxflags=${VCPKG_CXX_FLAGS}")

+        list(APPEND B2_OPTIONS "cxxflags=${VCPKG_CXX_FLAGS}")

     endif()

 

     if(VCPKG_CXX_FLAGS_RELEASE)

-        list(APPEND _bm_OPTIONS_REL "cxxflags=${VCPKG_CXX_FLAGS_RELEASE}")

+        list(APPEND B2_OPTIONS_REL "cxxflags=${VCPKG_CXX_FLAGS_RELEASE}")

     endif()

 

     if(VCPKG_CXX_FLAGS_DEBUG)

-        list(APPEND _bm_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}")

+        list(APPEND B2_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}")

     endif()

 

     if(VCPKG_C_FLAGS)

-        list(APPEND _bm_OPTIONS "cflags=${VCPKG_C_FLAGS}")

+        list(APPEND B2_OPTIONS "cflags=${VCPKG_C_FLAGS}")

     endif()

 

     if(VCPKG_C_FLAGS_RELEASE)

-        list(APPEND _bm_OPTIONS_REL "cflags=${VCPKG_C_FLAGS_RELEASE}")

+        list(APPEND B2_OPTIONS_REL "cflags=${VCPKG_C_FLAGS_RELEASE}")

     endif()

 

     if(VCPKG_C_FLAGS_DEBUG)

-        list(APPEND _bm_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}")

+        list(APPEND B2_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}")

     endif()

 

     if(VCPKG_LINKER_FLAGS)

-        list(APPEND _bm_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}")

+        list(APPEND B2_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}")

     endif()

 

     if(VCPKG_LINKER_FLAGS_RELEASE)

-        list(APPEND _bm_OPTIONS_REL "linkflags=${VCPKG_LINKER_FLAGS_RELEASE}")

+        list(APPEND B2_OPTIONS_REL "linkflags=${VCPKG_LINKER_FLAGS_RELEASE}")

     endif()

 

     if(VCPKG_LINKER_FLAGS_DEBUG)

-        list(APPEND _bm_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}")

+        list(APPEND B2_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}")

     endif()

 

     # Add build type specific options

     if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")

-        list(APPEND _bm_OPTIONS runtime-link=shared)

+        list(APPEND B2_OPTIONS runtime-link=shared)

     else()

-        list(APPEND _bm_OPTIONS runtime-link=static)

+        list(APPEND B2_OPTIONS runtime-link=static)

     endif()

 

     if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

-        list(APPEND _bm_OPTIONS link=shared)

+        list(APPEND B2_OPTIONS link=shared)

     else()

-        list(APPEND _bm_OPTIONS link=static)

+        list(APPEND B2_OPTIONS link=static)

     endif()

 

     if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64")

-        list(APPEND _bm_OPTIONS address-model=64 architecture=x86)

+        list(APPEND B2_OPTIONS address-model=64 architecture=x86)

     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")

-        list(APPEND _bm_OPTIONS address-model=32 architecture=arm)

+        list(APPEND B2_OPTIONS address-model=32 architecture=arm)

     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

-        list(APPEND _bm_OPTIONS address-model=64 architecture=arm)

+        list(APPEND B2_OPTIONS address-model=64 architecture=arm)

     else()

-        list(APPEND _bm_OPTIONS address-model=32 architecture=x86)

+        list(APPEND B2_OPTIONS address-model=32 architecture=x86)

     endif()

 

     file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT)

@@ -286,9 +281,9 @@ function(boost_modular_build)
     configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)

 

     if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")

-        list(APPEND _bm_OPTIONS toolset=msvc)

+        list(APPEND B2_OPTIONS toolset=msvc)

     elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")

-        list(APPEND _bm_OPTIONS toolset=gcc)

+        list(APPEND B2_OPTIONS toolset=gcc)

     else()

         message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")

     endif()

@@ -304,8 +299,8 @@ function(boost_modular_build)
                 --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage

                 --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel

                 --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam

-                ${_bm_OPTIONS}

-                ${_bm_OPTIONS_REL}

+                ${B2_OPTIONS}

+                ${B2_OPTIONS_REL}

                 variant=release

                 debug-symbols=on

             WORKING_DIRECTORY ${_bm_SOURCE_PATH}/build

@@ -322,8 +317,8 @@ function(boost_modular_build)
                 --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage

                 --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg

                 --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam

-                ${_bm_OPTIONS}

-                ${_bm_OPTIONS_DBG}

+                ${B2_OPTIONS}

+                ${B2_OPTIONS_DBG}

                 variant=debug

             WORKING_DIRECTORY ${_bm_SOURCE_PATH}/build

             LOGNAME build-${TARGET_TRIPLET}-dbg

@@ -381,7 +376,7 @@ function(boost_modular_build)
         string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries

         string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries

         string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries

-        string(REPLACE "-1_72" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries

+        string(REPLACE "-1_73" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries

         if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")

             # nothing to do

         elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})

diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam
index 9f485fee2..685c26c4e 100644
--- a/ports/boost-modular-build-helper/user-config.jam
+++ b/ports/boost-modular-build-helper/user-config.jam
@@ -24,8 +24,10 @@ else
 

 if "@PORT@" = "boost-python"

 {

-    using python : @VCPKG_PYTHON_VERSION@ : "@VCPKG_PYTHON_EXECUTABLE@" : "@VCPKG_PYTHON_INCLUDE@" : "@VCPKG_PYTHON_LIBS_RELEASE@" ;

-    using python : @VCPKG_PYTHON_VERSION@ : "@VCPKG_PYTHON_EXECUTABLE@" : "@VCPKG_PYTHON_INCLUDE@" : "@VCPKG_PYTHON_LIBS_DEBUG@" : <python-debugging>on ;

+    using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_RELEASE@" ;

+    using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_DEBUG@" : <python-debugging>on ;

+    using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_RELEASE@" ;

+    using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_DEBUG@" : <python-debugging>on ;

 }

 

 if "@PORT@" = "boost-mpi"