diff --git a/scripts/eosio_build.sh b/scripts/eosio_build.sh index d3128903097..a97ceaa5058 100755 --- a/scripts/eosio_build.sh +++ b/scripts/eosio_build.sh @@ -30,9 +30,8 @@ # https://github.com/EOSIO/eos/blob/master/LICENSE ########################################################################## -VERSION=2.1 # Build script version +VERSION=2.2 # Build script version CMAKE_BUILD_TYPE=Release -export DISK_MIN=20 DOXYGEN=false ENABLE_COVERAGE_TESTING=false CORE_SYMBOL_NAME="SYS" @@ -75,6 +74,7 @@ export LLVM_DIR=${LLVM_ROOT}/lib/cmake/llvm export DOXYGEN_VERSION=1_8_14 export DOXYGEN_ROOT=${SRC_LOCATION}/doxygen-${DOXYGEN_VERSION} export TINI_VERSION=0.18.0 +export DISK_MIN=5 # Setup directories mkdir -p $SRC_LOCATION diff --git a/scripts/eosio_build_centos.sh b/scripts/eosio_build_centos.sh index 8e7044001ab..621001d0a97 100755 --- a/scripts/eosio_build_centos.sh +++ b/scripts/eosio_build_centos.sh @@ -160,9 +160,10 @@ else printf " - No required YUM dependencies to install.\\n\\n" fi -if [ -d /opt/rh/rh-python36 ]; then +export PYTHON3PATH="/opt/rh/rh-python36" +if [ -d $PYTHON3PATH ]; then printf "Enabling python36...\\n" - source /opt/rh/rh-python36/enable || exit 1 + source $PYTHON3PATH/enable || exit 1 printf " - Python36 successfully enabled!\\n" fi @@ -190,7 +191,7 @@ if [ $? -ne 0 ]; then exit -1; fi printf "\\n" -export CPATH="$CPATH:/opt/rh/rh-python36/root/usr/include/python3.6m" # m on the end causes problems with boost finding python3 +export CPATH="${CPATH}:${PYTHON3PATH}/root/usr/include/python3.6m" # m on the end causes problems with boost finding python3 printf "Checking Boost library (${BOOST_VERSION}) installation...\\n" BOOSTVERSION=$( grep "#define BOOST_VERSION" "$HOME/opt/boost/include/boost/version.hpp" 2>/dev/null | tail -1 | tr -s ' ' | cut -d\ -f3 ) if [ "${BOOSTVERSION}" != "${BOOST_VERSION_MAJOR}0${BOOST_VERSION_MINOR}0${BOOST_VERSION_PATCH}" ]; then @@ -299,7 +300,7 @@ cd .. printf "\\n" function print_instructions() { - printf "source /opt/rh/python33/enable\\n" + printf "source ${PYTHON3PATH}/enable\\n" printf "source /opt/rh/devtoolset-7/enable\\n" return 0 }