Changeset 25785

Timestamp:

11/25/20 17:06:18 (4 years ago)

Author:

jdquinn

Message:

CHG: Support for Linux binaries

Location:

issm/trunk-jpl/externalpackages

Files:

• curl/install-7-linux-static.sh (modified) (1 diff)
• dakota/install-6.2-linux-static.sh (modified) (1 diff)
• gmt/configs/6/static/src (added)
• gmt/configs/6/static/src/CMakeLists.txt (added)
• gmt/install-6-linux-static.sh (modified) (3 diffs)
• petsc/install-3.12-linux-static.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/curl/install-7-linux-static.sh

@@ -8 +8 @@
 
 # Download source
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/curl-${VER}.tar.gz" "curl-${VER}.tar.gz"
+# $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/curl-${VER}.tar.gz" "curl-${VER}.tar.gz"
 
 # Unpack source

issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh

@@ -13 +13 @@
 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version)
-#export CXXFLAGS='-std=c++11'
 export DAK_BUILD=${DAK_ROOT}/build
 export DAK_INSTALL=${DAK_ROOT}/install

issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

@@ -7 +7 @@
 VER="6.0.0"
 
+CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
 PETSC_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
 
@@ -14 +15 @@
 # Find libgfortran and libgcc so we do not have to hardcode them
 #
-# Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
+# NOTE: For now, paths are hardcoded.
 #
 # TODO:
-# - Test if -static-libgfortran flag will avoid all of this.
-# - Otherwise, refactor this to work with other gfortran installations.
+# - Figure out how to find and grep for single result like we do with mdfind 
+#       under macOS.
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | grep -n libgfortran.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN="/usr/lib/gcc/x86_64-linux-gnu/8/libgfortran.a"
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | grep -n libgcc.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGCC="/usr/lib/gcc/x86_64-linux-gnu/8/libgcc.a"
 
+CURL_INCLUDE_DIRS="${CURL_ROOT}/include" \
+CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;/usr/lib/x86_64-linux-gnu/libssl.a;/usr/lib/x86_64-linux-gnu/libcrypto.a" \
 GDAL_EXTRA_LIBS="-lstdc++" # Determined by running `$GDAL_ROOT/bin/gdal-config --dep-libs` then removing duplicate libs
-NETCDF_EXTRA_LIBS="-lsqlite3 -lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/6.0/static/cmake/modules/FindNETCDF.cmake)
+NETCDF_EXTRA_LIBS="-lm -ldl -lz" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/6.0/static/cmake/modules/FindNETCDF.cmake)
 
 # Environment
 #
 export CC=mpicc
+export CURL_INCLUDE_DIRS=${CURL_INCLUDE_DIRS}
+export CURL_LIBRARIES=${CURL_LIBRARIES}
 
 # Download source
@@ -47 +52 @@
 # Copy custom configuration files
 cp ./configs/6/static/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
+cp ./configs/6/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
 cp ./configs/6/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
+cp ./configs/6/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
+cp ./configs/6/static/src/CMakeLists.txt ./src/src
 
 # Configure

issm/trunk-jpl/externalpackages/petsc/install-3.12-linux-static.sh

@@ -29 +29 @@
 # Configure
 #
-# NOTE: Cannot use --with-fpic option when compiling static libs,
+# NOTE: 
+# - Cannot use --with-fpic option when compiling static libs,
 #
 #               Cannot determine compiler PIC flags if shared libraries is turned off
@@ -52 +53 @@
         --download-parmetis=1 \
         --download-scalapack=1 \
-        --download-mumps=1
+        --download-mumps=1 \
+        --download-zlib=1 \
+        --download-hdf5=1
 
 # Compile and install