From 0fab6bca529e4007fdad645f5623cb4323c96663 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 13 Dec 2025 21:00:37 -0600 Subject: [PATCH] boost fixes --- cmake/libraries/boost.cmake | 18 +++++++++--------- docker/x86_64/mingw64 | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index f8aa3ca..7429196 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -94,28 +94,28 @@ if(PROJECT_ENABLE_BOOST) set(BOOST_LINK "static,shared") endif() + if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) + set(BOOST_CXX_STANDARD 20) + else() + set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD}) + endif() + set(BOOST_BUILD_ARGS --openssldir=$ENV{OPENSSL_ROOT_DIR} --prefix=${PROJECT_EXTERNAL_BUILD_ROOT} address-model=64 architecture=${BOOST_ARCH} cxxstd-dialect=gnu - cxxflags=-std=gnu++${CMAKE_CXX_STANDARD} - cxxstd=${CMAKE_CXX_STANDARD} + cxxflags=-std=gnu++${BOOST_CXX_STANDARD} + cxxstd=${BOOST_CXX_STANDARD} define=BOOST_ASIO_HAS_STD_STRING_VIEW define=BOOST_SYSTEM_NO_DEPRECATED link=${BOOST_LINK} - linkflags=-std=gnu++${CMAKE_CXX_STANDARD} + linkflags=-std=gnu++${BOOST_CXX_STANDARD} threading=multi variant=${BOOST_BUILD_TYPE_LOWER} ) - if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) - set(BOOST_URL_HASH SHA256=${BOOST2_HASH}) - else() - set(BOOST_URL_HASH SHA256=${BOOST_HASH}) - endif() - ExternalProject_Add(boost_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}.tar.gz diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index a241d4d..bba1e75 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -495,7 +495,7 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSI && ./bootstrap.sh \ --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread \ address-model=64 \ - cxxstd=${MY_CXX_STANDARD} \ + cxxstd=20 \ cxxstd-dialect=gnu \ architecture=x86 \ link=static,shared \ @@ -509,7 +509,7 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSI --prefix=${MY_MINGW_DIR} \ -j${MY_NUM_JOBS} \ address-model=64 \ - cxxstd=${MY_CXX_STANDARD} \ + cxxstd=20 \ cxxstd-dialect=gnu \ architecture=x86 \ link=static,shared \ @@ -552,8 +552,8 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION -j${MY_NUM_JOBS} \ address-model=64 \ architecture=x86 \ - cxxstd=${MY_CXX_STANDARD} \ - cxxstd-dialect=gnu \ + cxxstd=${MY_CXX_STANDARD} \ + cxxstd-dialect=gnu \ link=static,shared \ target-os=windows \ threading=multi \