Merge branch 'master' into epec-kernel

1 files changed, 18 insertions, 5 deletions

diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index ef8c904..5fddb13 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -87,11 +87,16 @@ mpfr_sysver()
 gmp_sysver()
 {
   # on some systems you have VERSION in gmp-$arch.h not gmp.h. use gmp*.h
-  if [ ! -e $1/include ]; then return; fi
-  gmppaths=`ls $1/include | grep ^gmp`
+  if [ -e $1/include/multiarch-x86_64-linux ]; then
+    subdir=include/multiarch-x86_64-linux
+  else
+    subdir=include
+  fi
+  if [ ! -e $1/$subdir ]; then return; fi
+  gmppaths=`ls $1/$subdir | grep ^gmp`
   if [ ! "$gmppaths" ]; then return; fi
   for gmpfile in $gmppaths; do
-    gmppath=$1/include/$gmpfile
+    gmppath=$1/$subdir/$gmpfile
     if [ "`grep __GNU_MP_VERSION $gmppath`" ]; then
       gmpmaj=`grep "define  *__GNU_MP_VERSION  *[0-9]*" $gmppath | awk '{print $3}'`
       gmpmin=`grep "define  *__GNU_MP_VERSION_MINOR  *[0-9]*" $gmppath | awk '{print $3}'`
@@ -155,8 +160,15 @@ flex_sysver()
 
 bison_sysver()
 {
+  # bison (GNU Bison) 2.7.12-4996
   if [ ! -x $1/bin/bison ]; then return ; fi
-  bison_sysver_result=`$1/bin/bison --version | grep bison | sed s/"[^0-9.]"/" "/g`
+  bison_sver=`$1/bin/bison --version | grep bison`
+  debug bison_sver1: $bison_sver
+  bison_sver=`echo $bison_sver | awk -F ")" ' { print $2 } '`
+  debug bison_sver2: $bison_sver
+  bison_sver=`echo $bison_sver | awk -F "-" ' { print $1 } '`
+  debug bison_sver3: $bison_sver
+  bison_sysver_result=$bison_sver
 }
 
 gcc_sysver()
@@ -425,7 +437,7 @@ find_installed_version()
         debug $depname"_sysver" $syspath
         eval $depname"_sysver" $syspath
         fsv_tmp=`eval echo "$"$depname"_sysver_result"`
-		if [ $fsv_tmp ]; then break; fi
+        if [ $fsv_tmp ]; then break; fi
       fi
     done
   fi
@@ -511,6 +523,7 @@ main()
   deps="qt4 cgal gmp mpfr boost opencsg glew eigen gcc bison flex make"
   #deps="$deps curl git" # not technically necessary for build
   #deps="$deps python cmake imagemagick" # only needed for tests
+  #deps="cgal"
   pretty_print title
   for depname in $deps; do
     debug "processing $dep"