Merge pull request #3432 from pacificcode/eosio_build_amazon

Amazon: changed boost version from 1.66 to 1.67

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_66_0"
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			"CentOS Linux")
 				FILE="${PWD}/scripts/eosio_build_centos.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_66_0"
+				export BOOST_ROOT="${HOME}/opt/boost_1_67_0"
 			;;
 			"Fedora")
 				FILE="${PWD}/scripts/eosio_build_fedora.sh"

scripts/eosio_build_amazon.sh

@@ -214,9 +214,9 @@
 	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_66" ]; then
+	if [ "${BVERSION}" != "1_67" ]; 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 this time.\\n"
 			printf "\\n\\tExiting now.\\n"
@@ -230,50 +230,51 @@
 			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" )
+		"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 "\\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 "\\tUnable to decompress Boost libraries @ %s/boost_1_66_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
+			printf "\\tUnable to decompress Boost libraries @ %s/boost_1_67_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
 			printf "\\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 "\\tUnable to remove Boost libraries @ %s/boost_1_66_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
+			printf "\\tUnable to remove Boost libraries @ %s/boost_1_67_0.tar.bz2 at this time.\\n" "${TEMP_DIR}"
 			printf "\\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 "\\tUnable to change directory into %s/boost_1_66_0/ at this time.\\n" "${TEMP_DIR}"
+			printf "\\tUnable to change directory into %s/boost_1_67_0/ at this time.\\n" "${TEMP_DIR}"
 			printf "\\tExiting now.\\n\\n"
 			exit 1;
 		fi
-		if ! ./bootstrap.sh "--prefix=$BOOST_ROOT"
+		if ! ./bootstrap.sh "--prefix=${BOOST_ROOT}"
 		then
 			printf "\\n\\tInstallation of boost libraries failed. 0\\n"
 			printf "\\n\\tExiting now.\\n"
 			exit 1
 		fi
-		if ! ./b2 install
+		if ! "${TEMP_DIR}"/boost_1_67_0/b2 install
 		then
 			printf "\\n\\tInstallation of boost libraries failed. 1\\n"
 			printf "\\n\\tExiting now.\\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 boost libraries directory @ %s/boost_1_66_0/.\\n" "${TEMP_DIR}"
+			printf "\\n\\tUnable to remove boost libraries directory @ %s/boost_1_67_0/.\\n" "${TEMP_DIR}"
 			printf "\\n\\tExiting now.\\n"
 			exit 1
 		fi
+		printf "\\tBoost successfully installed @ %s/opt/boost_1_67_0.\\n" "${HOME}"
 	else
-		printf "\\tBoost 1.66.0 found at %s/opt/boost_1_66_0.\\n" "${HOME}"
+		printf "\\tBoost 1.67.0 found at %s/opt/boost_1_67_0.\\n" "${HOME}"
 	fi
 
 	printf "\\n\\tChecking MongoDB installation.\\n"

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.66.\\n"
+			printf "\\tEOS.IO requires Boost version 1.67.\\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