From 113c5c7823de46aaf38bbf980abd81b6345999f6 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Wed, 27 Feb 2019 12:40:10 -0500 Subject: [PATCH] Set CI boost min/default to 1.67 (#1791) --- CMakeLists.txt | 2 +- appveyor.yml | 2 +- docker/ci/Dockerfile | 2 +- util/build_prep/bootstrap_boost.sh | 10 +++++----- util/build_prep/centos/prep.sh.in | 4 ++-- util/build_prep/macosx/prep.sh.in | 4 ++-- util/build_prep/ubuntu/prep.sh.in | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2b3ef9b..94ac5ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,7 +155,7 @@ if (BOOST_ROOT) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") endif () -find_package (Boost 1.66.0 REQUIRED COMPONENTS filesystem log thread program_options system) +find_package (Boost 1.67.0 REQUIRED COMPONENTS filesystem log thread program_options system) add_subdirectory(crypto/ed25519-donna) diff --git a/appveyor.yml b/appveyor.yml index adc03b4b..cafe6d00 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ install: - cmd: >- git submodule update --init --recursive - cmake -DNANO_GUI=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib" . + cmake -DNANO_GUI=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_67_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_67_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib" . - ps: Invoke-WebRequest -Uri https://aka.ms/vs/15/release/vc_redist.x64.exe -OutFile .\vc_redist.x64.exe build: diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 10fdb653..1dd69c6b 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -qq && apt-get install -yqq \ ENV BOOST_ROOT=/usr/local ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh -RUN ./bootstrap_boost.sh -m -B 1.66 +RUN ./bootstrap_boost.sh -m RUN rm bootstrap_boost.sh RUN apt-get update -qq && apt-get install -yqq \ diff --git a/util/build_prep/bootstrap_boost.sh b/util/build_prep/bootstrap_boost.sh index a95a4e6c..4038c9df 100755 --- a/util/build_prep/bootstrap_boost.sh +++ b/util/build_prep/bootstrap_boost.sh @@ -9,7 +9,7 @@ debugLevel=0 buildCArgs=() buildCXXArgs=() buildLDArgs=() -boostVersion='1.69' +boostVersion='1.67' while getopts 'hmcCkpvB:' OPT; do case "${OPT}" in h) @@ -73,10 +73,10 @@ if [ "${useClang}" = 'true' ]; then fi case "${boostVersion}" in - 1.66) - BOOST_BASENAME=boost_1_66_0 - BOOST_URL=https://downloads.sourceforge.net/project/boost/boost/1.66.0/${BOOST_BASENAME}.tar.bz2 - BOOST_ARCHIVE_SHA256='5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9' + 1.67) + BOOST_BASENAME=boost_1_67_0 + BOOST_URL=https://downloads.sourceforge.net/project/boost/boost/1.67.0/${BOOST_BASENAME}.tar.bz2 + BOOST_ARCHIVE_SHA256='2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba' ;; 1.69) BOOST_BASENAME=boost_1_69_0 diff --git a/util/build_prep/centos/prep.sh.in b/util/build_prep/centos/prep.sh.in index ff6511ae..3786ea6a 100644 --- a/util/build_prep/centos/prep.sh.in +++ b/util/build_prep/centos/prep.sh.in @@ -28,8 +28,8 @@ yes | yum install -y llvm-toolset-7-cmake devtoolset-7-llvm|| exit 1 exit 1 fi - if ! version_min 'boost --version' 1.65.999; then - echo "boost version too low (1.66.0+ required)" >&2 + if ! version_min 'boost --version' 1.66.999; then + echo "boost version too low (1.67.0+ required)" >&2 exit 1 fi diff --git a/util/build_prep/macosx/prep.sh.in b/util/build_prep/macosx/prep.sh.in index c3b8a086..d9ff2641 100644 --- a/util/build_prep/macosx/prep.sh.in +++ b/util/build_prep/macosx/prep.sh.in @@ -50,8 +50,8 @@ if ! have boost; then exit 1 fi -if ! version_min 'boost --version' 1.65.999; then - echo "boost version too low (1.66.0+ required)" >&2 +if ! version_min 'boost --version' 1.66.999; then + echo "boost version too low (1.67.0+ required)" >&2 exit 1 fi diff --git a/util/build_prep/ubuntu/prep.sh.in b/util/build_prep/ubuntu/prep.sh.in index 7fac61cb..bf8233be 100644 --- a/util/build_prep/ubuntu/prep.sh.in +++ b/util/build_prep/ubuntu/prep.sh.in @@ -29,8 +29,8 @@ if ! have boost; then exit 1 fi -if ! version_min 'boost --version' 1.65.999; then - echo "boost version too low (1.66.0+ required)" >&2 +if ! version_min 'boost --version' 1.66.999; then + echo "boost version too low (1.67.0+ required)" >&2 exit 1 fi boost_dir="$(boost --install-prefix)"