Changeset 22179

Timestamp:

10/20/17 15:41:53 (7 years ago)

Author:

dlcheng

Message:

CHG: Added explicit -fPIC compiler flags where applicable to allow Linux_Ubuntu_Binaries to build with mpich 3.2 and PETSc 3.7.

Location:

issm/trunk

Files:

• externalpackages/mpich/install-3.2-linux64-static.sh (modified) (1 diff)
• externalpackages/petsc/install-3.7-linux64-static.sh (modified) (2 diffs)
• jenkins/linux64_ross_static (modified) (4 diffs)

issm/trunk/externalpackages/mpich/install-3.2-linux64-static.sh

@@ -16 +16 @@
 rm -rf mpich-3.2
 
-#compilation flags
-export CXXFLAGS='-fPIC'
-export CFLAGS='-fPIC'
-export FFLAGS='-fPIC'
-
 #Configure mpich
 cd src
 ./configure \
         --prefix="$ISSM_DIR/externalpackages/mpich/install" \
-        --disable-shared \
-        --with-pic=yes
+        --with-cxxoptflags="-fPIC"
 
 #Compile mpich (this new version supports parallel make)

issm/trunk/externalpackages/petsc/install-3.7-linux64-static.sh

@@ -20 +20 @@
         --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \
         --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-        --with-debugging=0 \
+        --with-debugging=1 \
         --with-valgrind=0 \
         --with-x=0 \
@@ -30 +30 @@
         --download-fblaslapack=1 \
         --download-scalapack=1 \
-        --with-pic=1
+        --COPTFLAGS="-O3 -fPIC" \
+        --CXXOPTFLAGS="-O3 -fPIC" \
+        --FOPTFLAGS="-O3 -fPIC"
 
 #Compile and intall

issm/trunk/jenkins/linux64_ross_static

@@ -5 +5 @@
 
 #MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
+MATLAB_PATH="/usr/local/MATLAB/R2017b"
 
 #ISSM CONFIGURATION 
@@ -12 +12 @@
         --enable-standalone-executables \
         --enable-standalone-libraries \
-        --enable-standalone-modules \
         --with-matlab-dir=$MATLAB_PATH \
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lfmpich" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -24 +23 @@
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
-        --with-numthreads=4'
+        --with-numthreads=4 \
+        --with-cxxoptflags="-fPIC"'
 
 #PYTHON and MATLAB testing
@@ -37 +37 @@
 EXTERNALPACKAGES="autotools    install.sh
                                                 cmake        install.sh
-                                                mpich        install-3.0-linux64-static.sh
+                                                mpich        install-3.2-linux64-static.sh
                                                 m1qn3        install.sh
-                                                petsc        install-3.6-linux64-static.sh
+                                                petsc        install-3.7-linux64-static.sh
                                                 triangle     install-linux64.sh
                                                 shell2junit  install.sh"