From 7ec58cc5548286b7eb761a4548b74436f15155ee Mon Sep 17 00:00:00 2001 From: seelabs Date: Fri, 3 Feb 2017 13:49:34 -0500 Subject: [PATCH] Update build scripts to support latest boost and ubuntu distros --- Builds/Ubuntu/install_boost.sh | 2 +- Builds/Ubuntu/install_rippled_depends_ubuntu.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Builds/Ubuntu/install_boost.sh b/Builds/Ubuntu/install_boost.sh index 9f9d0e297..f1911b118 100755 --- a/Builds/Ubuntu/install_boost.sh +++ b/Builds/Ubuntu/install_boost.sh @@ -4,7 +4,7 @@ # This script builds boost with the correct ABI flags for ubuntu # -version=59 +version=63 patch=0 if hash lsb_release 2>/dev/null; then diff --git a/Builds/Ubuntu/install_rippled_depends_ubuntu.sh b/Builds/Ubuntu/install_rippled_depends_ubuntu.sh index 140dbd1d7..5bfa086f3 100755 --- a/Builds/Ubuntu/install_rippled_depends_ubuntu.sh +++ b/Builds/Ubuntu/install_rippled_depends_ubuntu.sh @@ -44,7 +44,11 @@ if [ ${ubuntu_release} == "14.04" ] || [ ${ubuntu_release} == "15.04" ]; then exit 0 fi -if [ ${ubuntu_release} == "16.04" ] || [ ${ubuntu_release} == "15.10" ]; then +# Test if 0th parameter has a version number greater than or equal to the 1st param +function version_check() { test "$(printf '%s\n' "$@" | sort -V | tail -n 1)" == "$1"; } + +# this should work for versions greater than 15.10 +if version_check ${ubuntu_release} 15.10; then apt-get update apt-get -y upgrade apt-get -y install python-software-properties curl git scons ctags pkg-config protobuf-compiler libprotobuf-dev libssl-dev python-software-properties libboost-all-dev