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 --- ports/boost-thread/CONTROL | 4 ++-- ports/boost-thread/b2-options.cmake | 1 + ports/boost-thread/portfile.cmake | 10 +++------- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'ports/boost-thread') diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index 0f85b5c7f..634ab045d 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-thread -Version: 1.72.0 -Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi +Version: 1.73.0 +Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi Homepage: https://github.com/boostorg/thread Description: Boost thread module diff --git a/ports/boost-thread/b2-options.cmake b/ports/boost-thread/b2-options.cmake index 07acc10b5..198b23084 100644 --- a/ports/boost-thread/b2-options.cmake +++ b/ports/boost-thread/b2-options.cmake @@ -1 +1,2 @@ +set(B2_REQUIREMENTS "/boost/date_time//boost_date_time") list(APPEND B2_OPTIONS /boost/thread//boost_thread) diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 34c523bb7..de74f48d6 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -1,21 +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/thread - REF boost-1.72.0 - SHA512 2a149952bea4bf58b571de69fd81f9b0fbded75c762883f8611e9478ac853d9ba229f8fbb2168b8194f897465e77fd06bdcf75b140ad5d64defdadaccf56ce5a + REF boost-1.73.0 + SHA512 732bf64b0c5ea8db327a429ba470e620ec0a8771e3fdaba9baf7080d0f4eb93f718813b7062881d3971bdf2b9254b460f82175d3f9fbd453a29153f87caa6c58 HEAD_REF master ) 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" ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) -- cgit v1.2.3