Changeset 25243

Timestamp:

07/09/20 20:21:31 (5 years ago)

Author:

jdquinn

Message:

CHG: New installation scripts in support of macOS Solid Earth binaries build.

Location:

issm/trunk-jpl/externalpackages

Files:

• dakota/install-6.2-linux-static.sh (modified) (1 diff)
• dakota/install-6.2-mac-static.sh (modified) (1 diff)
• dakota/install-6.2-mac.sh (modified) (1 diff)
• gmt/configs/6.0/cmake (added)
• gmt/configs/6.0/cmake/ConfigUser.cmake (added)
• gmt/configs/6.0/static (added)
• gmt/configs/6.0/static/cmake (added)
• gmt/configs/6.0/static/cmake/ConfigUser.static.cmake (added)
• gmt/configs/6.0/static/cmake/modules (added)
• gmt/configs/6.0/static/cmake/modules/FindGDAL.cmake (added)
• gmt/configs/6.0/static/cmake/modules/FindGSHHG.cmake (added)
• gmt/configs/6.0/static/cmake/modules/FindNETCDF.cmake (added)
• gmt/install-6.0-linux-static.sh (modified) (3 diffs)
• gmt/install-6.0-linux.sh (modified) (1 diff)
• gmt/install-6.0-mac-static.sh (added)
• gmt/install-6.0-mac.sh (modified) (1 diff)
• netcdf/install-4.7-mac-parallel-static.sh (added)
• netcdf/install-4.7-parallel-static.sh (modified) (3 diffs)

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

@@ -24 +24 @@
 mkdir build install src
 
-#Download from ISSM server
+# Download source
 ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${VER}-public.src.tar.gz" "dakota-${VER}-public-src.tar.gz"
 

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

@@ -11 +11 @@
 #
 
-# Find libgfortran and libgcc so we do not have to hardcode them
+# Find libgfortran and libgcc so we do not have to hardcode them.
 #
-# NOTE: Assumes user installed gfortran via Homebrew
+# Should retrieve a copy of gfortran that is compiled from source before 
+# returning one that is installed via package manager.
 #
-# TODO: Refactor this to work with other gfortran installations.
+# TODO:
+# - Test if -static-libgfortran flag will avoid all of this.
+# - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | grep -n libgfortran.a | grep -v i386 | sed "s/[0-9]*://g" | head -1) # Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
+LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | grep -n libgfortran.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | grep -n libgcc.a | grep -v i386 | sed "s/[0-9]*://g" | head -1) # Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
+LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | grep -n libgcc.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
 
 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it

issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

@@ -10 +10 @@
 ## Environment
 #
-# Find libgfortran and so we do not have to hardcode it
+
+# Find libgfortran so that we do not have to hardcode it.
 #
-# NOTE:
-# - Assumes user installed gfortran via Homebrew.
-# - Searches for libgfortran.a as it is easier to find it.
+# Should retrieve a copy of gfortran that is compiled from source before 
+# returning one that is installed via package manager.
 #
-# TODO: Refactor this to work with other gfortran installations.
-#
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | grep -n libgfortran.a | grep -v i386 | sed "s/[0-9]*://g" | head -1) # Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
+LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | grep -n libgfortran.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 

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

@@ -2 +2 @@
 set -eu
 
+
+# TODO:
+# - Apply changes made to ./install-6.0-mac-static.sh and customized 
+#       configuration files to this file.
+#
 
 ## Constants
@@ -17 +22 @@
 ZLIB_ROOT="${PETSC_ROOT}"
 
-GDAL_LIBRARY="${GDAL_ROOT}/lib/libgdal.a;${NETCDF_ROOT}/lib/libnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;${PROJ_ROOT}/lib/libproj.a;${ZLIB_ROOT}/lib/libz.a;/usr/lib/x86_64-linux-gnu/libpthread.so;/usr/lib/x86_64-linux-gnu/libm.so;/usr/lib/x86_64-linux-gnu/librt.so;/usr/lib/x86_64-linux-gnu/libdl.so;${CURL_ROOT}/lib/libcurl.a;/usr/lib/x86_64-linux-gnu/libssl.a;/usr/lib/x86_64-linux-gnu/libcrypto.a;/usr/lib/x86_64-linux-gnu/libsqlite3.a;/usr/lib/x86_64-linux-gnu/libexpat.a;/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25;" # Determined by running `$GDAL_ROOT/bin/gdal-config --dep-libs`, removing duplicate libs, then adding libmpicxx as, otherwise, various symbols in libgdal are undefined (compiled with mpicxx)
+GDAL_LIBRARY="${GDAL_ROOT}/lib/libgdal.a;${NETCDF_ROOT}/lib/libnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;${PROJ_ROOT}/lib/libproj.a;${ZLIB_ROOT}/lib/libz.a;/usr/lib/x86_64-linux-gnu/libpthread.so;/usr/lib/x86_64-linux-gnu/libm.so;/usr/lib/x86_64-linux-gnu/librt.so;/usr/lib/x86_64-linux-gnu/libdl.so;${CURL_ROOT}/lib/libcurl.a;/usr/lib/x86_64-linux-gnu/libssl.a;/usr/lib/x86_64-linux-gnu/libcrypto.a;/usr/lib/x86_64-linux-gnu/libsqlite3.a;/usr/lib/x86_64-linux-gnu/libexpat.a;/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25;" # Determined by running `$GDAL_ROOT/bin/gdal-config --dep-libs` then removing duplicate libs
 NETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a;/usr/lib/x86_64-linux-gnu/libm.so;${CURL_ROOT}/lib/libcurl.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;${ZLIB_ROOT}/lib/libz.a;/usr/lib/x86_64-linux-gnu/libssl.a;/usr/lib/x86_64-linux-gnu/libcrypto.a;/usr/lib/x86_64-linux-gnu/libdl.so" # Determined by running `$NETCDF_ROOT/bin/nc-config --libs`
 
@@ -39 +44 @@
 
 # Copy custom configuration files
-cp ./configs/6.0/linux/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
-cp ./configs/6.0/linux/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
+cp ./configs/6.0/static/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
+cp ./configs/6.0/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
 
 # Configure

issm/trunk-jpl/externalpackages/gmt/install-6.0-linux.sh

@@ -28 +28 @@
 
 # Copy custom configuration files
-cp ./configs/6.0/linux/cmake/ConfigUser.cmake ./src/cmake
+cp ./configs/6.0/cmake/ConfigUser.cmake ./src/cmake
 
 # Configure

issm/trunk-jpl/externalpackages/gmt/install-6.0-mac.sh

@@ -28 +28 @@
 
 # Copy custom configuration files
-cp ./configs/6.0/linux/cmake/ConfigUser.cmake ./src/cmake
+cp ./configs/6.0/cmake/ConfigUser.cmake ./src/cmake
 
 # Configure

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static.sh

@@ -21 +21 @@
 #
 VER="4.7.2"
+
 CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
@@ -29 +30 @@
 export CC=mpicc
 export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
-export LIBS="${CURL_ROOT}/lib/libcurl.a ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a /usr/lib/x86_64-linux-gnu/libssl.a /usr/lib/x86_64-linux-gnu/libcrypto.a -L/usr/lib/x86_64-linux-gnu -ldl"
+export LIBS="/usr/lib/x86_64-linux-gnu/libssl.a /usr/lib/x86_64-linux-gnu/libcrypto.a -L/usr/lib/x86_64-linux-gnu -ldl"
+
+export CURLLIB="${CURL_ROOT}/lib/libcurl.a"
+export HDF5LIB="${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a"
+export ZLIB="${ZLIB_ROOT}/lib/libz.a"
 
 # Download source
@@ -55 +60 @@
         --enable-netcdf4 \
         --disable-testsets \
-        --disable-examples
+        --disable-examples \
+        --disable-filter-testing
 
 # Compile and install