From 1ab3bdb62cab1e8bf7db1a6c16839cef0c49f50d Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 30 Jul 2019 15:59:50 -0400 Subject: [PATCH] boost 1.70 requires log_setup component specifically updated CMAKE 1.67 and 1.69 dont require explicit but will use (#2185) update boostrap_boost.sh to mirror https://docs.nano.org/integration-guides/build-options/ --- CMakeLists.txt | 2 +- util/build_prep/bootstrap_boost.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c87c4b45..13d75592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ set(Boost_USE_MULTITHREADED ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") -find_package (Boost 1.67.0 REQUIRED COMPONENTS filesystem log thread program_options system) +find_package (Boost 1.67.0 REQUIRED COMPONENTS filesystem log log_setup thread program_options system) if (NANO_ROCKSDB) find_package (RocksDB REQUIRED) find_package (ZLIB REQUIRED) diff --git a/util/build_prep/bootstrap_boost.sh b/util/build_prep/bootstrap_boost.sh index eeaa8efc..47033144 100755 --- a/util/build_prep/bootstrap_boost.sh +++ b/util/build_prep/bootstrap_boost.sh @@ -26,7 +26,7 @@ while getopts 'hmcCkpvB:' OPT; do exit 0 ;; m) - bootstrapArgs+=('--with-libraries=thread,log,filesystem,program_options') + bootstrapArgs+=('--with-libraries=system,thread,log,filesystem,program_options') ;; c) useClang='true'