diff --git a/ci/actions/windows/build.ps1 b/ci/actions/windows/build.ps1 index 5868c9b4..4e963a4b 100644 --- a/ci/actions/windows/build.ps1 +++ b/ci/actions/windows/build.ps1 @@ -9,6 +9,7 @@ if (${env:artifact} -eq 1) { $env:NETWORK_CFG = "live" $env:BUILD_TYPE = "Release" } + $env:NANO_SHARED_BOOST = "OFF" $env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\lib\rocksdb.lib"' $env:NANO_TEST = "-DNANO_TEST=OFF" $env:TRAVIS_TAG = ${env:TAG} @@ -25,6 +26,7 @@ else { $env:BUILD_TYPE = "Debug" $env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\debug\lib\rocksdbd.lib"' } + $env:NANO_SHARED_BOOST = "OFF" $env:NETWORK_CFG = "test" $env:NANO_TEST = "-DNANO_TEST=ON" $env:CI = '-DCI_TEST="1"' diff --git a/ci/actions/windows/configure.bat b/ci/actions/windows/configure.bat index db31eedd..b37de8b2 100644 --- a/ci/actions/windows/configure.bat +++ b/ci/actions/windows/configure.bat @@ -21,7 +21,8 @@ cmake .. ^ -DNANO_SIMD_OPTIMIZATIONS=TRUE ^ -Dgtest_force_shared_crt=on ^ -DBoost_NO_SYSTEM_PATHS=TRUE ^ - -DBoost_NO_BOOST_CMAKE=TRUE + -DBoost_NO_BOOST_CMAKE=TRUE ^ + -DNANO_SHARED_BOOST=%NANO_SHARED_BOOST% set exit_code=%errorlevel% if %exit_code% neq 0 goto exit diff --git a/ci/build-travis.sh b/ci/build-travis.sh index f56c3076..1478d18d 100755 --- a/ci/build-travis.sh +++ b/ci/build-travis.sh @@ -72,6 +72,7 @@ cmake \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBOOST_ROOT=/tmp/boost/ \ + -DNANO_SHARED_BOOST=ON \ -DQt5_DIR=${qt_dir} \ -DCI_TEST="1" \ ${BACKTRACE} \ diff --git a/docker/ci/Dockerfile-clang b/docker/ci/Dockerfile-clang index 41f5e70c..adf04df7 100644 --- a/docker/ci/Dockerfile-clang +++ b/docker/ci/Dockerfile-clang @@ -21,4 +21,4 @@ RUN ./fetch_boost.sh # BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE # see https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3 -RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h /tmp/backtrace.h \ No newline at end of file +RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h /tmp/backtrace.h diff --git a/docker/ci/Dockerfile-clang-6 b/docker/ci/Dockerfile-clang-6 index 7c6b0355..8178aa7c 100644 --- a/docker/ci/Dockerfile-clang-6 +++ b/docker/ci/Dockerfile-clang-6 @@ -20,3 +20,9 @@ ENV BOOST_ROOT=/tmp/boost ADD util/build_prep/fetch_boost.sh fetch_boost.sh RUN COMPILER=clang-6 ./fetch_boost.sh + +# workaround to get a path that can be easily passed into cmake for +# BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE +# see https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3 + +RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/5/include/backtrace.h /tmp/backtrace.h diff --git a/docker/ci/Dockerfile-gcc b/docker/ci/Dockerfile-gcc index 8b588f22..5ffc63ed 100644 --- a/docker/ci/Dockerfile-gcc +++ b/docker/ci/Dockerfile-gcc @@ -7,6 +7,6 @@ RUN ./fetch_rocksdb.sh ENV BOOST_ROOT=/tmp/boost -ADD util/build_prep/fetch_boost.sh fetch_boost.sh +ADD util/build_prep/bootstrap_boost.sh bootstrap_boost.sh RUN COMPILER=gcc ./fetch_boost.sh