diff options
| -rwxr-xr-x | scripts/check-dependencies.sh | 7 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index 536c46f..0401fbb 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -161,7 +161,7 @@ curl_sysver() cmake_sysver() { if [ ! -x $1/bin/cmake ]; then return ; fi - cmake_sysver_result=`$1/bin/cmake --version | grep cmake | sed s/"[^0-9.]"/" "/g` + cmake_sysver_result=`$1/bin/cmake --version | grep cmake | sed s/"[^0-9.]"/" "/g | awk '{ print $1 }'` } make_sysver() @@ -364,6 +364,11 @@ get_minversion_from_readme() { if [ -e README.md ]; then READFILE=README.md; fi if [ -e ../README.md ]; then READFILE=../README.md; fi + if [ ! $READFILE ]; then + if [ "`command -v dirname`" ]; then + READFILE=`dirname $0`/../README.md + fi + fi if [ ! $READFILE ]; then echo "cannot find README.md"; exit; fi debug get_minversion_from_readme $* if [ ! $1 ]; then return; fi diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index e091444..a57d1ba 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -120,6 +120,12 @@ build_boost() fi tar xjf boost_$bversion.tar.bz2 cd boost_$bversion + if [ "`gcc --version|grep 4.7`" ]; then + if [ "`echo $version | grep 1.47`" ]; then + echo gcc 4.7 incompatible with boost 1.47. edit boost version in $0 + exit + fi + fi # We only need certain portions of boost ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex if [ $CXX ]; then @@ -334,7 +340,7 @@ fi build_eigen 3.1.1 build_gmp 5.0.5 build_mpfr 3.1.1 -build_boost 1.47.0 +build_boost 1.49.0 # NB! For CGAL, also update the actual download URL in the function build_cgal 4.0.2 build_glew 1.7.0 |