[issm-svn] r22227 - in issm/trunk: externalpackages/mpich externalpackages/petsc jenkins

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2017-11-03 14:33:52 -0700 (Fri, 03 Nov 2017)
New Revision: 22227

Modified:
   issm/trunk/externalpackages/mpich/install-3.0-linux64-static.sh
   issm/trunk/externalpackages/petsc/install-3.6-linux64-static.sh
   issm/trunk/jenkins/linux64_ross_static
Log:
CHG: Adjusted configuration for Linux_Ubuntu_Binaries to allow for statically built and linked libraries.

Modified: issm/trunk/externalpackages/mpich/install-3.0-linux64-static.sh
===================================================================
--- issm/trunk/externalpackages/mpich/install-3.0-linux64-static.sh	2017-11-03 20:41:53 UTC (rev 22226)
+++ issm/trunk/externalpackages/mpich/install-3.0-linux64-static.sh	2017-11-03 21:33:52 UTC (rev 22227)
@@ -15,15 +15,10 @@
 mv mpich-3.0.4/* src
 rm -rf mpich-3.0.4
 
-export CXXFLAGS='-fPIC'
-export CFLAGS='-fPIC'
-export FFLAGS='-fPIC'
-
 #Configure mpich
 cd src
 ./configure \
-	--prefix="$ISSM_DIR/externalpackages/mpich/install" \
-	--disable-shared \
+	--prefix="$ISSM_DIR/externalpackages/mpich/install"
 
 #Compile mpich (this new version supports parallel make)
 if [ $# -eq 0 ]; then

Modified: issm/trunk/externalpackages/petsc/install-3.6-linux64-static.sh
===================================================================
--- issm/trunk/externalpackages/petsc/install-3.6-linux64-static.sh	2017-11-03 20:41:53 UTC (rev 22226)
+++ issm/trunk/externalpackages/petsc/install-3.6-linux64-static.sh	2017-11-03 21:33:52 UTC (rev 22227)
@@ -28,8 +28,7 @@
 	--download-parmetis=1 \
 	--download-mumps=1 \
 	--download-fblaslapack=1 \
-	--download-scalapack=1 \
-	--with-pic=1
+	--download-scalapack=1
 
 #Compile and intall
 make

Modified: issm/trunk/jenkins/linux64_ross_static
===================================================================
--- issm/trunk/jenkins/linux64_ross_static	2017-11-03 20:41:53 UTC (rev 22226)
+++ issm/trunk/jenkins/linux64_ross_static	2017-11-03 21:33:52 UTC (rev 22227)
@@ -14,7 +14,7 @@
 	--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 -lmpi -lfmpich" \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpl -lpmpich" \
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -35,9 +35,9 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools    install.sh
 						cmake        install.sh
-						mpich        install-3.2-linux64-static.sh
+						mpich        install-3.0-linux64-static.sh
 						m1qn3        install.sh
-						petsc        install-3.7-linux64-static.sh
+						petsc        install-3.6-linux64-static.sh
 						triangle     install-linux64.sh
 						shell2junit  install.sh"