Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Set boost min to 1.69 (#2779)

Browse source 
Minimum boost moved to 1.69. 
promote nano-pow-server sub module to a commit with 1.69 boost requirements as well
Documentation update in https://github.com/nanocurrency/nano-docs/pull/297
This commit is contained in:
Russel Waters 2020-05-22 07:34:47 -04:00 • committed by GitHub
commit 2a1a0fb2b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -255,7 +255,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 log_setup thread program_options system)
find_package (Boost 1.69.0 REQUIRED COMPONENTS filesystem log log_setup thread program_options system)
if (NANO_ROCKSDB)
find_package (RocksDB REQUIRED)

2
ci/actions/osx/install_deps.sh
View file

@ -8,5 +8,5 @@ if [[ ${TEST-0} -eq 1 ]]; then
else
util/build_prep/fetch_rocksdb.sh
fi
util/build_prep/bootstrap_boost.sh -m -c -B 1.70 && \
sudo util/build_prep/fetch_boost.sh
util/build_prep/macosx/build_qt.sh

4
docker/ci/Dockerfile-clang
View file

@ -14,8 +14,8 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
ENV BOOST_ROOT=/tmp/boost
ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh
RUN ./bootstrap_boost.sh -m -c -B 1.70
ADD util/build_prep/fetch_boost.sh fetch_boost.sh
RUN ./fetch_boost.sh
# workaround to get a path that can be easily passed into cmake for
# BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE

4
docker/ci/Dockerfile-clang-6
View file

@ -17,6 +17,6 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
ENV BOOST_ROOT=/tmp/boost
ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh
ADD util/build_prep/fetch_boost.sh fetch_boost.sh
RUN ./bootstrap_boost.sh -m -c -B 1.70
RUN COMPILER=clang-6 ./fetch_boost.sh

2
docker/ci/Dockerfile-gcc
View file

@ -9,4 +9,4 @@ ENV BOOST_ROOT=/tmp/boost
ADD util/build_prep/fetch_boost.sh fetch_boost.sh
RUN TRAVIS_COMPILER=gcc ./fetch_boost.sh
RUN COMPILER=gcc ./fetch_boost.sh

2
nano-pow-server

@ -1 +1 @@
Subproject commit 32e7826865ce4af069f79eceeefe2a1092e28b53
Subproject commit 1279afc2b6a5382c708d642d8c190bf0f68d340e

17
util/build_prep/bootstrap_boost.sh
View file

@ -11,7 +11,7 @@ buildThreads=1
buildCArgs=()
buildCXXArgs=()
buildLDArgs=()
boostVersion='1.67'
boostVersion='1.69'
while getopts 'hmscCkpvB:j:' OPT; do
case "${OPT}" in
h)
@ -83,11 +83,6 @@ if [ "${useClang}" = 'true' ]; then
fi
case "${boostVersion}" in
1.67)
BOOST_BASENAME=boost_1_67_0
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.67.0/${BOOST_BASENAME}.tar.bz2/download
BOOST_ARCHIVE_SHA256='2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba'
;;
1.69)
BOOST_BASENAME=boost_1_69_0
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.69.0/${BOOST_BASENAME}.tar.bz2/download
@ -98,6 +93,16 @@ case "${boostVersion}" in
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.70.0/${BOOST_BASENAME}.tar.bz2/download
BOOST_ARCHIVE_SHA256='430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778'
;;
1.72)
BOOST_BASENAME=boost_1_72_0
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.72.0/${BOOST_BASENAME}.tar.bz2/download
BOOST_ARCHIVE_SHA256='59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722'
;;
1.73)
BOOST_BASENAME=boost_1_73_0
BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.73.0/${BOOST_BASENAME}.tar.bz2/download
BOOST_ARCHIVE_SHA256='4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
;;
*)
echo "Unsupported Boost version: ${boostVersion}" >&2
exit 1

4
util/build_prep/centos/prep.sh.in
View file

@ -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.66.999; then
echo "boost version too low (1.67.0+ required)" >&2
if ! version_min 'boost --version' 1.68.999; then
echo "boost version too low (1.69.0+ required)" >&2
exit 1
fi

6
util/build_prep/fetch_boost.sh
View file

@ -1,11 +1,11 @@
#!/usr/bin/env bash
OS=`uname`
TRAVIS_COMPILER="${TRAVIS_COMPILER:-clang}"
COMPILER="${COMPILER:-clang}"
pushd /tmp
wget -O boost-$OS-$TRAVIS_COMPILER-latest.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$TRAVIS_COMPILER-latest.tgz
tar -zxf boost-$OS-$TRAVIS_COMPILER-latest.tgz
wget -O boost-$OS-$COMPILER-1.70.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70.tgz
tar -zxf boost-$OS-$COMPILER-1.70.tgz
mv tmp/* .
rm -fr tmp
popd

4
util/build_prep/macosx/prep.sh.in
View file

@ -50,8 +50,8 @@ if ! have boost; then
exit 1
fi
if ! version_min 'boost --version' 1.66.999; then
echo "boost version too low (1.67.0+ required)" >&2
if ! version_min 'boost --version' 1.68.999; then
echo "boost version too low (1.69.0+ required)" >&2
exit 1
fi

4
util/build_prep/ubuntu/prep.sh.in
View file

@ -29,8 +29,8 @@ if ! have boost; then
exit 1
fi
if ! version_min 'boost --version' 1.66.999; then
echo "boost version too low (1.67.0+ required)" >&2
if ! version_min 'boost --version' 1.68.999; then
echo "boost version too low (1.69.0+ required)" >&2
exit 1
fi
boost_dir="$(boost --install-prefix)"