From e918f01992b6368712c4f41a5df6ae8ab3e4817a Mon Sep 17 00:00:00 2001 From: Bill Hamilton Date: Fri, 25 May 2018 23:29:03 +0000 Subject: [PATCH 1/2] CentOS: changed boost version from 1.66 to 1.67 --- eosio_build.sh | 2 +- scripts/eosio_build_centos.sh | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/eosio_build.sh b/eosio_build.sh index a11ee2f3df1..81ed63c3b61 100755 --- a/eosio_build.sh +++ b/eosio_build.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_66_0" + export BOOST_ROOT="${HOME}/opt/boost_1_67_0" ;; "elementary OS") FILE="${PWD}/scripts/eosio_build_ubuntu.sh" diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index eeeafc22cad..cefc8127ccb 100644 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -125,8 +125,9 @@ printf "\\n\\tYUM repository successfully updated.\\n\\n" - DEP_ARRAY=( git autoconf automake bzip2 libtool ocaml.x86_64 doxygen graphviz-devel.x86_64 libicu-devel.x86_64 \ - bzip2-devel.x86_64 openssl-devel.x86_64 gmp-devel.x86_64 python-devel.x86_64 gettext-devel.x86_64) + DEP_ARRAY=( git autoconf automake bzip2 libtool ocaml.x86_64 doxygen graphviz-devel.x86_64 \ + libicu-devel.x86_64 bzip2.x86_64 bzip2-devel.x86_64 openssl-devel.x86_64 gmp-devel.x86_64 \ + python-devel.x86_64 gettext-devel.x86_64) COUNT=1 DISPLAY="" DEP="" @@ -300,9 +301,9 @@ printf "\\n\\tChecking boost library installation.\\n" BVERSION=$( grep "#define BOOST_VERSION" "${BOOST_ROOT}/include/boost/version.hpp" 2>/dev/null \ | tail -1 | tr -s ' ' | cut -d\ -f3) - if [ "${BVERSION}" != "106600" ]; then + if [ "${BVERSION}" != "106700" ]; then printf "\\tRemoving existing boost libraries in %s/opt/boost* .\\n" "${HOME}" - if ! rm -rf "${HOME}/opt/boost*" + if ! rm -rf "${HOME}"/opt/boost* then printf "\\n\\tUnable to remove deprecated boost libraries at %s/opt/boost*.\\n" "${HOME}" printf "\\n\\tExiting now.\\n\\n" @@ -315,27 +316,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.66.0/source/boost_1_66_0.tar.bz2) + 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) 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_66_0.tar.bz2" + if ! tar xf "${TEMP_DIR}/boost_1_67_0.tar.bz2" then - printf "\\n\\tUnable to unarchive file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to unarchive file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! rm -f "${TEMP_DIR}/boost_1_66_0.tar.bz2" + if ! rm -f "${TEMP_DIR}/boost_1_67_0.tar.bz2" then - printf "\\n\\tUnable to remove file %s/boost_1_66_0.tar.bz2.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove file %s/boost_1_67_0.tar.bz2.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! cd "${TEMP_DIR}/boost_1_66_0/" + if ! cd "${TEMP_DIR}/boost_1_67_0/" then - printf "\\n\\tUnable to enter directory %s/boost_1_66_0.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to enter directory %s/boost_1_67_0.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi @@ -345,21 +346,21 @@ printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! ./b2 install + if ! "${TEMP_DIR}"/boost_1_67_0/b2 -j2 install then printf "\\n\\tInstallation of boost libraries failed with the above error. 1\\n" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - if ! rm -rf "${TEMP_DIR}/boost_1_66_0/" + if ! rm -rf "${TEMP_DIR}/boost_1_67_0/" then - printf "\\n\\tUnable to remove directory %s/boost_1_66_0.\\n" "${TEMP_DIR}" + printf "\\n\\tUnable to remove directory %s/boost_1_67_0.\\n" "${TEMP_DIR}" printf "\\n\\tExiting now.\\n\\n" exit 1; fi - printf "\\tBoost 1.66.0 successfully installed @ %s/opt/boost_1_66_0.\\n\\n" "${HOME}" + printf "\\tBoost 1.67.0 successfully installed @ %s/opt/boost_1_67_0.\\n\\n" "${HOME}" else - printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n\\n" "${HOME}" + printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n\\n" "${HOME}" fi printf "\\n\\tChecking MongoDB installation.\\n" From 26ff92535e92f268f78683ae361e5bb5580006c2 Mon Sep 17 00:00:00 2001 From: Bill Hamilton Date: Fri, 25 May 2018 23:31:24 +0000 Subject: [PATCH 2/2] changed to one line --- eosio_build.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/eosio_build.sh b/eosio_build.sh index 50ae5126f2e..82be9fa46c3 100755 --- a/eosio_build.sh +++ b/eosio_build.sh @@ -143,7 +143,6 @@ 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" ;; "CentOS Linux") FILE="${PWD}/scripts/eosio_build_centos.sh" @@ -153,7 +152,6 @@ 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" ;; "elementary OS") FILE="${PWD}/scripts/eosio_build_ubuntu.sh" @@ -161,7 +159,6 @@ 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" ;; "Fedora") FILE="${PWD}/scripts/eosio_build_fedora.sh" @@ -169,7 +166,6 @@ 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" ;; "Linux Mint") FILE="${PWD}/scripts/eosio_build_ubuntu.sh" @@ -177,7 +173,6 @@ 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" ;; "Ubuntu") FILE="${PWD}/scripts/eosio_build_ubuntu.sh" @@ -185,13 +180,13 @@ 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" ;; *) printf "\\n\\tUnsupported Linux Distribution. Exiting now.\\n\\n" exit 1 esac + export BOOST_ROOT="${HOME}/opt/boost_1_67_0" OPENSSL_ROOT_DIR=/usr/include/openssl WASM_ROOT="${HOME}/opt/wasm" fi