Merge pull request #288 from openscad/issue11_2

Issue11 2

4 files changed, 53 insertions, 26 deletions

diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index 9393b4d..7153e44 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -514,7 +514,7 @@ main()
     dep_minver=$find_min_version_result
     compare_version $dep_minver $dep_sysver
     dep_compare=$compare_version_result
-  	pretty_print $depname $dep_minver $dep_sysver $dep_compare
+    pretty_print $depname $dep_minver $dep_sysver $dep_compare
   done
   check_old_local
   check_misc
diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh
index 66fb7a9..980fa7b 100644
--- a/scripts/setenv-unibuild.sh
+++ b/scripts/setenv-unibuild.sh
@@ -34,6 +34,11 @@ setenv_common()
  echo OPENSCAD_LIBRARIES modified
  echo GLEWDIR modified
 
+ if [ "`uname -m | grep sparc64`" ]; then
+   echo detected sparc64. forcing 32 bit with export ABI=32
+   ABI=32
+   export ABI
+ fi
 }
 
 setenv_freebsd()
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index 09b6b79..b793e9b 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -1,4 +1,4 @@
- #!/bin/sh -e
+#!/bin/sh -e
 
 # uni-build-dependencies by don bright 2012. copyright assigned to
 # Marius Kintel and Clifford Wolf, 2012. released under the GPL 2, or
@@ -184,6 +184,7 @@ build_gmp()
   mkdir build
   cd build
   ../configure --prefix=$DEPLOYDIR --enable-cxx
+  make -j$NUMCPU
   make install
 }
 
@@ -205,6 +206,7 @@ build_mpfr()
   mkdir build
   cd build
   ../configure --prefix=$DEPLOYDIR --with-gmp=$DEPLOYDIR
+  make -j$NUMCPU
   make install
   cd ..
 }
@@ -223,6 +225,10 @@ build_boost()
   if [ ! -f boost_$bversion.tar.bz2 ]; then
     curl --insecure -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2
   fi
+  if [ ! $? -eq 0 ]; then
+    echo download failed. 
+    exit 1
+  fi
   tar xjf boost_$bversion.tar.bz2
   cd boost_$bversion
   if [ "`gcc --version|grep 4.7`" ]; then
@@ -247,17 +253,16 @@ build_boost()
   fi
   if [ $CXX ]; then
     if [ $CXX = "clang++" ]; then
-      $BJAMBIN -j$NUMCPU toolset=clang install
-      # ./b2 -j$NUMCPU toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" install
+      $BJAMBIN -j$NUMCPU toolset=clang
     fi
   else
     $BJAMBIN -j$NUMCPU
-    if [ $? = 0 ]; then
-      $BJAMBIN install
-    else
-      echo boost build failed
-      exit 1
-    fi
+  fi
+  if [ $? = 0 ]; then
+    $BJAMBIN install
+  else
+    echo boost build failed
+    exit 1
   fi
 }
 
@@ -301,7 +306,14 @@ build_cgal()
 
 build_glew()
 {
-  if [ -e $DEPLOYDIR/include/GL/glew.h ]; then
+  GLEW_INSTALLED=
+  if [ -e $DEPLOYDIR/lib64/libGLEW.so ]; then
+    GLEW_INSTALLED=1
+  fi
+  if [ -e $DEPLOYDIR/lib/libGLEW.so ]; then
+    GLEW_INSTALLED=1
+  fi
+  if [ $GLEW_INSTALLED ]; then
     echo "glew already installed. not building"
     return
   fi
@@ -494,29 +506,29 @@ if [ "`cmake --version | grep 'version 2.[1-6][^0-9]'`" ]; then
   build_cmake 2.8.8
 fi
 
-# build_git 1.7.10.3
-
-# Singly build CGAL or OpenCSG
-# (Most systems have all libraries available as packages except CGAL/OpenCSG)
-# (They can be built singly here by passing a command line arg to the script)
+# Singly build certain tools or libraries
 if [ $1 ]; then
+  if [ $1 = "git" ]; then
+    build_git 1.7.10.3
+    exit $?
+  fi
   if [ $1 = "cgal" ]; then
     build_cgal 4.0.2 use-sys-libs
-    exit
+    exit $?
   fi
   if [ $1 = "opencsg" ]; then
     build_opencsg 1.3.2
-    exit
+    exit $?
   fi
-  if [ $1 == "qt4" ]; then
+  if [ $1 = "qt4" ]; then
     # such a huge build, put here by itself
     build_qt4 4.8.4
-    exit
+    exit $?
   fi
-  if [ $1 == "glu" ]; then
+  if [ $1 = "glu" ]; then
     # Mesa and GLU split in late 2012, so it's not on some systems
     build_glu 9.0.0
-    exit
+    exit $?
   fi
 fi
 
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
index cf9f136..98170de 100755
--- a/scripts/uni-get-dependencies.sh
+++ b/scripts/uni-get-dependencies.sh
@@ -6,8 +6,13 @@
 
 get_fedora_deps()
 {
- sudo yum install qt-devel bison flex eigen2-devel \
-  boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig git
+ sudo yum install qt-devel bison flex eigen2-devel python-paramiko \
+  boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig git libXmu-devel
+}
+
+get_qomo_deps()
+{
+ get_fedora_deps
 }
 
 get_altlinux_deps()
@@ -28,7 +33,7 @@ get_freebsd_deps()
 get_netbsd_deps()
 {
  sudo pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \
-  qt4 glew cgal opencsg modular-xorg
+  qt4 glew cgal opencsg modular-xorg python27 py27-paramiko
 }
 
 get_opensuse_deps()
@@ -50,7 +55,8 @@ get_debian_deps()
  for pkg in build-essential libqt4-dev libqt4-opengl-dev \
   libxmu-dev cmake bison flex git-core libboost-all-dev \
   libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev \
-  libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev; do
+  libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \
+  python-paramiko ; do
    sudo apt-get -y install $pkg;
  done
 }
@@ -75,10 +81,14 @@ if [ -e /etc/issue ]; then
   get_fedora_deps
  elif [ "`grep -i mageia /etc/issue`" ]; then
   get_mageia_deps
+ elif [ "`grep -i qomo /etc/issue`" ]; then
+  get_qomo_deps
  elif [ "`command -v rpm`" ]; then
   if [ "`rpm -qa | grep altlinux`" ]; then
    get_altlinux_deps
   fi
+ else
+  unknown
  fi
 elif [ "`uname | grep -i freebsd `" ]; then
  get_freebsd_deps