From 24e8be5fcfddd0da98b58a63cd918849787fb06f Mon Sep 17 00:00:00 2001 From: yurybura 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 * [boost-modular-build-helper] move port-specific b2 options to the file `/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 --- scripts/boost/generate-ports.ps1 | 102 +++++++++++---------------- scripts/boost/post-source-stubs/python.cmake | 8 --- 2 files changed, 43 insertions(+), 67 deletions(-) delete mode 100644 scripts/boost/post-source-stubs/python.cmake (limited to 'scripts') diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index e154bd38d..619ba0061 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.72.0", + $version = "1.73.0", $portsDir = $null ) @@ -50,10 +50,11 @@ function Generate() $controlDeps = ($Depends | sort) -join ", " $versionSuffix = "" - if ($PortName -eq "iostreams" -or $PortName -eq "process" -or $PortName -eq "python") - { - $versionSuffix = "-1" - } + + # if ($PortName -eq "") + # { + # $versionSuffix = "-1" + # } mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null $controlLines = @( @@ -69,8 +70,17 @@ function Generate() $controlLines += @( "" "Feature: icu" - "Description: ICU backend for Boost.Locale" "Build-Depends: icu" + "Description: ICU backend for Boost.Locale" + ) + } + if ($PortName -eq "python") + { + $controlLines += @( + "" + "Feature: python2" + "Build-Depends: python2 (windows)" + "Description: Build with Python2 support" ) } if ($PortName -eq "regex") @@ -78,8 +88,8 @@ function Generate() $controlLines += @( "" "Feature: icu" - "Description: ICU backend for Boost.Regex" "Build-Depends: icu" + "Description: ICU backend for Boost.Regex" ) } $controlLines | out-file -enc ascii "$portsDir/boost-$PortName/CONTROL" @@ -87,8 +97,6 @@ function Generate() $portfileLines = @( "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1" "" - "include(vcpkg_common_functions)" - "" ) if ($PortName -eq "system") @@ -115,9 +123,15 @@ function Generate() { $portfileLines += @(" PATCHES Removeseekpos.patch") } - if ($PortName -eq "process") + if ($PortName -eq "outcome") + { + # 1.73 Known Issue + $portfileLines += @(" PATCHES 0001-outcome-assert.patch") + } + if ($PortName -eq "beast") { - $portfileLines += @(" PATCHES async_pipe_header.patch") + # 1.73 Known Issue + $portfileLines += @(" PATCHES 0002-beast-coroutines.patch") } $portfileLines += @( ")" @@ -131,58 +145,24 @@ function Generate() if ($NeedsBuild) { - if ($PortName -eq "locale") - { - $portfileLines += @( - "if(`"icu`" IN_LIST FEATURES)" - " set(BOOST_LOCALE_ICU on)" - "else()" - " set(BOOST_LOCALE_ICU off)" - "endif()" - "" - "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" - "boost_modular_build(" - " SOURCE_PATH `${SOURCE_PATH}" - " BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/cmake-fragment.cmake`"" - " OPTIONS" - " boost.locale.iconv=off" - " boost.locale.posix=off" - " /boost/locale//boost_locale" - " boost.locale.icu=`${BOOST_LOCALE_ICU}" - ")" - ) - } - elseif ($PortName -eq "regex") - { - $portfileLines += @( - "if(`"icu`" IN_LIST FEATURES)" - " set(REQUIREMENTS `"/user-config//icuuc /user-config//icudt /user-config//icuin BOOST_HAS_ICU=1`")" - "else()" - " set(REQUIREMENTS)" - "endif()" - "" - "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" - "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"`${REQUIREMENTS}`")" - ) - } - elseif ($PortName -eq "thread") + $portfileLines += @( + "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" + ) + # b2-options.cmake contains port-specific build options + if (Test-Path "$portsDir/boost-$PortName/b2-options.cmake") { $portfileLines += @( - "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" "boost_modular_build(" " SOURCE_PATH `${SOURCE_PATH}" - " REQUIREMENTS `"/boost/date_time//boost_date_time`"" - " OPTIONS /boost/thread//boost_thread" - " BOOST_CMAKE_FRAGMENT `${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" + " BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake`"" ")" ) } else { $portfileLines += @( - "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})" - ) + ) } } @@ -298,30 +278,32 @@ foreach ($library in $libraries) elseif ($_ -match "noncopyable|ref|swap|get_pointer|checked_delete|visit_each") { "core" } elseif ($_ -eq "type") { "core" } elseif ($_ -match "unordered_") { "unordered" } - elseif ($_ -match "cstdint") { "integer" } + elseif ($_ -match "cstdint|integer_fwd|integer_traits") { "integer" } elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" } elseif ($_ -match "^version|^workaround") { "config" } - elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } + elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_cast|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } elseif ($_ -match "iterator_adaptors|generator_iterator|pointee") { "iterator" } elseif ($_ -eq "regex_fwd") { "regex" } elseif ($_ -eq "make_default") { "convert" } elseif ($_ -eq "foreach_fwd") { "foreach" } elseif ($_ -eq "cerrno") { "system" } + elseif ($_ -eq "circular_buffer_fwd") { "circular_buffer" } elseif ($_ -eq "archive") { "serialization" } - elseif ($_ -eq "none") { "optional" } - elseif ($_ -eq "integer_traits") { "integer" } + elseif ($_ -match "none|none_t") { "optional" } elseif ($_ -eq "limits") { "compatibility" } - elseif ($_ -eq "math_fwd") { "math" } + elseif ($_ -match "cstdfloat|math_fwd") { "math" } + elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes and elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" } elseif ($_ -eq "nondet_random") { "random" } elseif ($_ -eq "memory_order") { "atomic" } - elseif ($_ -eq "blank") { "detail" } + elseif ($_ -match "blank|blank_fwd|numeric_traits") { "detail" } elseif ($_ -match "is_placeholder|mem_fn") { "bind" } elseif ($_ -eq "exception_ptr") { "exception" } - elseif ($_ -eq "multi_index_container") { "multi_index" } + elseif ($_ -match "multi_index_container|multi_index_container_fwd") { "multi_index" } elseif ($_ -eq "lexical_cast") { "lexical_cast"; "math" } elseif ($_ -match "token_iterator|token_functions") { "tokenizer" } elseif ($_ -eq "numeric" -and $library -notmatch "numeric_conversion|interval|odeint|ublas") { "numeric_conversion"; "interval"; "odeint"; "ublas" } + elseif ($_ -eq "io_fwd") { "io" } else { $_ } } | group | % name | ? { $_ -ne $library } @@ -335,6 +317,8 @@ foreach ($library in $libraries) # Boost contains cycles, so remove a few dependencies to break the loop. (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits|^exception") -or ($_ -notmatch "utility")) ` -and ` + (($library -notmatch "assert") -or ($_ -notmatch "integer"))` + -and ` (($library -notmatch "range") -or ($_ -notmatch "algorithm"))` -and ` (($library -ne "config") -or ($_ -notmatch "integer"))` diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake deleted file mode 100644 index 5e2ae2b76..000000000 --- a/scripts/boost/post-source-stubs/python.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# 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}") -- cgit v1.2.3