Changeset 21177

Timestamp:

09/01/16 12:14:06 (9 years ago)

Author:

glperez

Message:

CHG: Python/Numpy installed on Jenkins machine is not working. We have to install the version in externalpackages.
CHG: HDF5 uses C code with C++ style comments. This causes problem when the C compiler's standard does not support that style of comments. Added CFLAG to take care of that.

Location:

issm/trunk-jpl

Files:

• externalpackages/hdf5/install.sh (modified) (1 diff)
• jenkins/linux64_ross (modified) (2 diffs)

issm/trunk-jpl/externalpackages/hdf5/install.sh

@@ -17 +17 @@
 rm -rf hdf5-1.8.9
 
+# This project uses C code with C++ style comment default C standard used by 
+# GNU's C compiler's default C standard  does not support C++ style comments.
+# As such, we need to specify a standard that does.
+export CFLAGS='-std=c99'
+
 #Configure and compile
 cd src

issm/trunk-jpl/jenkins/linux64_ross

@@ -19 +19 @@
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-python-dir=/usr\
-        --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
+        --with-python-dir=$ISSM_DIR/externalpackages/python/install \
+        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
@@ -43 +43 @@
                                                 chaco         install.sh 
                                                 m1qn3         install.sh          
+                  hdf5          install.sh
+                                                netcdf        install.sh
+                                                netcdf-cxx    install.sh
+                                                netcdf-python install.sh
+                                                python        install-2.7.3-linux64.sh
+                  numpy         install-linux64.sh
                                                 shell2junit   install.sh"