From ab063f00dac0a1082ef154d51134343043741df4 Mon Sep 17 00:00:00 2001 From: Syed Jafri Date: Thu, 24 May 2018 23:25:38 -0600 Subject: [PATCH] Revert "Update boost 1_66 to 1_67" --- .buildkite/coverage.yml | 2 +- .gitignore | 1 - CMakeLists.txt | 2 +- Docker/builder/Dockerfile | 6 +++--- eosio_build.sh | 8 ++++---- scripts/eosio_build_amazon.sh | 22 +++++++++++----------- scripts/eosio_build_centos.sh | 22 +++++++++++----------- scripts/eosio_build_darwin.sh | 2 +- scripts/eosio_build_fedora.sh | 28 ++++++++++++++-------------- 9 files changed, 46 insertions(+), 47 deletions(-) diff --git a/.buildkite/coverage.yml b/.buildkite/coverage.yml index 8eda049bcbd..99c0e064c7a 100644 --- a/.buildkite/coverage.yml +++ b/.buildkite/coverage.yml @@ -21,7 +21,7 @@ steps: mounts: - /etc/buildkite-agent/config:/config environment: - - BOOST_ROOT=/root/opt/boost_1_67_0 + - BOOST_ROOT=/root/opt/boost_1_66_0 - OPENSSL_ROOT_DIR=/usr/include/openssl - WASM_ROOT=/root/opt/wasm - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin diff --git a/.gitignore b/.gitignore index 0e1176e8ad0..a1c8455f4ec 100644 --- a/.gitignore +++ b/.gitignore @@ -76,5 +76,4 @@ build-debug/* etc/eosio/node_* var/lib/node_* .vscode -.idea .DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index 61444f9489a..092eac8cd54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ IF( WIN32 ) set(Boost_USE_MULTITHREADED ON) set(BOOST_ALL_DYN_LINK OFF) # force dynamic linking for all libraries ENDIF(WIN32) -FIND_PACKAGE(Boost 1.67 REQUIRED COMPONENTS +FIND_PACKAGE(Boost 1.66 REQUIRED COMPONENTS thread date_time filesystem diff --git a/Docker/builder/Dockerfile b/Docker/builder/Dockerfile index a01cce4942f..c0bfec7aeae 100644 --- a/Docker/builder/Dockerfile +++ b/Docker/builder/Dockerfile @@ -26,13 +26,13 @@ RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.6-Linux-x ENV CC clang ENV CXX clang++ -RUN wget https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 -O - | tar -xj \ - && cd boost_1_67_0 \ +RUN wget https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2 -O - | tar -xj \ + && cd boost_1_66_0 \ && ./bootstrap.sh --prefix=/usr/local \ && echo 'using clang : 4.0 : clang++-4.0 ;' >> project-config.jam \ && ./b2 -d0 -j$(nproc) --with-thread --with-date_time --with-system --with-filesystem --with-program_options \ --with-signals --with-serialization --with-chrono --with-test --with-context --with-locale --with-coroutine --with-iostreams toolset=clang link=static install \ - && cd .. && rm -rf boost_1_67_0 + && cd .. && rm -rf boost_1_66_0 RUN wget https://github.com/mongodb/mongo-c-driver/releases/download/1.9.3/mongo-c-driver-1.9.3.tar.gz -O - | tar -xz \ && cd mongo-c-driver-1.9.3 \ diff --git a/eosio_build.sh b/eosio_build.sh index 50ae5126f2e..a11ee2f3df1 100755 --- a/eosio_build.sh +++ b/eosio_build.sh @@ -143,7 +143,7 @@ export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm export CMAKE=${HOME}/opt/cmake/bin/cmake export PATH=${HOME}/opt/mongodb/bin:$PATH - export BOOST_ROOT="${HOME}/opt/boost_1_67_0" + export BOOST_ROOT="${HOME}/opt/boost_1_66_0" ;; "CentOS Linux") FILE="${PWD}/scripts/eosio_build_centos.sh" @@ -153,7 +153,7 @@ export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm export CMAKE=${HOME}/opt/cmake/bin/cmake export PATH=${HOME}/opt/mongodb/bin:$PATH - export BOOST_ROOT="${HOME}/opt/boost_1_67_0" + export BOOST_ROOT="${HOME}/opt/boost_1_66_0" ;; "elementary OS") FILE="${PWD}/scripts/eosio_build_ubuntu.sh" @@ -161,7 +161,7 @@ C_COMPILER=clang-4.0 MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf export PATH=${HOME}/opt/mongodb/bin:$PATH - export BOOST_ROOT="${HOME}/opt/boost_1_67_0" + export BOOST_ROOT="${HOME}/opt/boost_1_66_0" ;; "Fedora") FILE="${PWD}/scripts/eosio_build_fedora.sh" @@ -169,7 +169,7 @@ C_COMPILER=gcc MONGOD_CONF=/etc/mongod.conf export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm - export BOOST_ROOT="${HOME}/opt/boost_1_67_0" + export BOOST_ROOT="${HOME}/opt/boost_1_66_0" ;; "Linux Mint") FILE="${PWD}/scripts/eosio_build_ubuntu.sh" diff --git a/scripts/eosio_build_amazon.sh b/scripts/eosio_build_amazon.sh index cce0811a2be..5eb077cd6d0 100644 --- a/scripts/eosio_build_amazon.sh +++ b/scripts/eosio_build_amazon.sh @@ -214,7 +214,7 @@ printf "\\n\\tChecking boost library installation.\\n" BVERSION=$( grep "BOOST_LIB_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \ | tail -1 | tr -s ' ' | cut -d\ -f3 | sed 's/[^0-9\._]//gI' ) - if [ "${BVERSION}" != "1_67" ]; then + if [ "${BVERSION}" != "1_66" ]; then printf "\\tRemoving existing boost libraries in %s/opt/boost*.\\n" "${HOME}" if ! rm -rf "${HOME}/opt/boost*" then @@ -230,27 +230,27 @@ exit 1 fi STATUS=$(curl -LO -w '%{http_code}' --connect-timeout 30 \ - "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2" ) + "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2" ) if [ "${STATUS}" -ne 200 ]; then printf "\\tUnable to download Boost libraries at this time.\\n" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! tar xf "${TEMP_DIR}/boost_1_67_0.tar.bz2" + if ! tar xf "${TEMP_DIR}/boost_1_66_0.tar.bz2" then - printf "\\tUnable to decompress Boost libraries @ %s/boost_1_67_0.tar.bz2 at this time.\\n" "${TEMP_DIR}" + printf "\\tUnable to decompress Boost libraries @ %s/boost_1_66_0.tar.bz2 at this time.\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! rm -f "${TEMP_DIR}/boost_1_67_0.tar.bz2" + if ! rm -f "${TEMP_DIR}/boost_1_66_0.tar.bz2" then - printf "\\tUnable to remove Boost libraries @ %s/boost_1_67_0.tar.bz2 at this time.\\n" "${TEMP_DIR}" + printf "\\tUnable to remove Boost libraries @ %s/boost_1_66_0.tar.bz2 at this time.\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! cd "${TEMP_DIR}/boost_1_67_0/" + if ! cd "${TEMP_DIR}/boost_1_66_0/" then - printf "\\tUnable to change directory into %s/boost_1_67_0/ at this time.\\n" "${TEMP_DIR}" + printf "\\tUnable to change directory into %s/boost_1_66_0/ at this time.\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi @@ -266,14 +266,14 @@ printf "\\n\\tExiting now.\\n" exit 1 fi - if ! rm -rf "${TEMP_DIR}/boost_1_67_0/" + if ! rm -rf "${TEMP_DIR}/boost_1_66_0/" then - printf "\\n\\tUnable to remove boost libraries directory @ %s/boost_1_67_0/.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove boost libraries directory @ %s/boost_1_66_0/.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n" exit 1 fi else - printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n" "${HOME}" + printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n" "${HOME}" fi printf "\\n\\tChecking MongoDB installation.\\n" diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index 3a3f0f16751..eeeafc22cad 100644 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -315,27 +315,27 @@ printf "\\n\\tExiting now.\\n\\n" exit 1; fi - STATUS=$(curl -LO -w '%{http_code}' --connect-timeout 30 https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2) + STATUS=$(curl -LO -w '%{http_code}' --connect-timeout 30 https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2) if [ "${STATUS}" -ne 200 ]; then printf "\\tUnable to download Boost libraries at this time.\\n" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! tar xf "${TEMP_DIR}/boost_1_67_0.tar.bz2" + if ! tar xf "${TEMP_DIR}/boost_1_66_0.tar.bz2" then - printf "\\n\\tUnable to unarchive file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to unarchive file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! rm -f "${TEMP_DIR}/boost_1_67_0.tar.bz2" + if ! rm -f "${TEMP_DIR}/boost_1_66_0.tar.bz2" then - printf "\\n\\tUnable to remove file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! cd "${TEMP_DIR}/boost_1_67_0/" + if ! cd "${TEMP_DIR}/boost_1_66_0/" then - printf "\\n\\tUnable to enter directory %s/boost_1_67_0.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to enter directory %s/boost_1_66_0.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi @@ -351,15 +351,15 @@ printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! rm -rf "${TEMP_DIR}/boost_1_67_0/" + if ! rm -rf "${TEMP_DIR}/boost_1_66_0/" then - printf "\\n\\tUnable to remove directory %s/boost_1_67_0.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove directory %s/boost_1_66_0.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - printf "\\tBoost 1.67.0 successfully installed @ %s/opt/boost_1_67_0.\\n\\n" "${HOME}" + printf "\\tBoost 1.66.0 successfully installed @ %s/opt/boost_1_66_0.\\n\\n" "${HOME}" else - printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n\\n" "${HOME}" + printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n\\n" "${HOME}" fi printf "\\n\\tChecking MongoDB installation.\\n" diff --git a/scripts/eosio_build_darwin.sh b/scripts/eosio_build_darwin.sh index d2cb3ea71e4..c82d8cbb855 100644 --- a/scripts/eosio_build_darwin.sh +++ b/scripts/eosio_build_darwin.sh @@ -180,7 +180,7 @@ if [ "${BVERSION}" != "106700" ]; then if [ ! -z "${BVERSION}" ]; then printf "\\tFound Boost Version %s.\\n" "${BVERSION}" - printf "\\tEOS.IO requires Boost version 1.67.\\n" + printf "\\tEOS.IO requires Boost version 1.66.\\n" printf "\\tWould you like to uninstall version %s and install Boost version 1.67.\\n" "${BVERSION}" select yn in "Yes" "No"; do case $yn in diff --git a/scripts/eosio_build_fedora.sh b/scripts/eosio_build_fedora.sh index a24b49207f2..c8cecb61c27 100644 --- a/scripts/eosio_build_fedora.sh +++ b/scripts/eosio_build_fedora.sh @@ -158,7 +158,7 @@ printf "\\n\\tChecking boost library installation.\\n" BVERSION=$( grep "BOOST_LIB_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \ | tail -1 | tr -s ' ' | cut -d\ -f3 | sed 's/[^0-9\._]//gI' ) - if [ "${BVERSION}" != "1_67" ]; then + if [ "${BVERSION}" != "1_66" ]; then printf "\\tRemoving existing boost libraries in %s/opt/boost* .\\n" "${HOME}" if ! rm -rf "${HOME}/opt/boost*" then @@ -173,51 +173,51 @@ printf "\\tExiting now.\\n\\n" exit 1; fi - STATUS=$( curl -LO -w '%{http_code}' --connect-timeout 30 https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 ) + STATUS=$( curl -LO -w '%{http_code}' --connect-timeout 30 https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2 ) if [ "${STATUS}" -ne 200 ]; then printf "\\tUnable to download Boost libraries at this time.\\n" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! tar xf "${TEMP_DIR}/boost_1_67_0.tar.bz2" + if ! tar xf "${TEMP_DIR}/boost_1_66_0.tar.bz2" then - printf "\\n\\tUnable to unarchive file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to unarchive file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! rm -f "${TEMP_DIR}/boost_1_67_0.tar.bz2" + if ! rm -f "${TEMP_DIR}/boost_1_66_0.tar.bz2" then - printf "\\n\\tUnable to remove file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! cd "${TEMP_DIR}/boost_1_67_0/" + if ! cd "${TEMP_DIR}/boost_1_66_0/" then - printf "\\n\\tUnable to enter directory %s/boost_1_67_0.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to enter directory %s/boost_1_66_0.\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! "${TEMP_DIR}/boost_1_67_0/bootstrap.sh" "--prefix=$BOOST_ROOT" + if ! "${TEMP_DIR}/boost_1_66_0/bootstrap.sh" "--prefix=$BOOST_ROOT" then printf "\\n\\tInstallation of boost libraries failed. 0\\n" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! "${TEMP_DIR}/boost_1_67_0/b2" install + if ! "${TEMP_DIR}/boost_1_66_0/b2" install then printf "\\n\\tInstallation of boost libraries failed. 1\\n" printf "\\tExiting now.\\n\\n" exit 1; fi - if ! rm -rf "${TEMP_DIR}/boost_1_67_0" + if ! rm -rf "${TEMP_DIR}/boost_1_66_0" then - printf "\\n\\tUnable to remove directory %s/boost_1_67_0. 1\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove directory %s/boost_1_66_0. 1\\n" "${TEMP_DIR}" printf "\\tExiting now.\\n\\n" exit 1; fi - printf "\\n\\tBoost 1.67.0 successfully installed at %s/opt/boost_1_67_0.\\n\\n" "${HOME}" + printf "\\n\\tBoost 1.66.0 successfully installed at %s/opt/boost_1_66_0.\\n\\n" "${HOME}" else - printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n" "${HOME}" + printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n" "${HOME}" fi printf "\\n\\tChecking MongoDB C++ driver installation.\\n"