Changeset 28213

Timestamp:

04/05/24 20:47:42 (12 months ago)

Author:

jdquinn

Message:

CHG: Removing more optional dependencies

Location:

issm/trunk-jpl/externalpackages

Files:

• gdal/install-3-python-static.sh (modified) (2 diffs)
• gdal/install-3-static.sh (modified) (3 diffs)
• gmt/install-6-linux-static.sh (modified) (2 diffs)
• gmt/install-6-mac-static.sh (modified) (3 diffs)

issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh ¶

@@ -46 +46 @@
         -DCURL_USE_STATIC_LIBS=ON \
         -DGDAL_USE_EXPAT=OFF \
+        -DGDAL_USE_GEOTIFF_INTERNAL=ON \
+        -DGDAL_USE_GIF_INTERNAL=ON \
         -DGDAL_USE_JPEG_INTERNAL=ON \
         -DGDAL_USE_JPEG12_INTERNAL=ON \
@@ -54 +56 @@
         -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
         -DNETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a" \
+        -DGDAL_USE_OPENCL=OFF \
         -DGDAL_USE_OPENJPEG=OFF \
         -DGDAL_USE_OPENSSL=OFF \

issm/trunk-jpl/externalpackages/gdal/install-3-static.sh ¶

@@ -2 +2 @@
 set -e
 
+
+## TODO
+#       - May want to supply path to Python instead of, effectively, using result of `which python`
+#
 
 ## Constants
@@ -42 +46 @@
         -DCURL_USE_STATIC_LIBS=ON \
         -DGDAL_USE_EXPAT=OFF \
+        -DGDAL_USE_GEOTIFF_INTERNAL=ON \
+        -DGDAL_USE_GIF_INTERNAL=ON \
         -DGDAL_USE_JPEG_INTERNAL=ON \
         -DGDAL_USE_JPEG12_INTERNAL=ON \
@@ -50 +56 @@
         -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
         -DNETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a" \
+        -DGDAL_USE_OPENCL=OFF \
         -DGDAL_USE_OPENJPEG=OFF \
         -DGDAL_USE_OPENSSL=OFF \

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

@@ -19 +19 @@
 LIBGFORTRAN=$(find /usr -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
+echo "Finding libgcc..."
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc.* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 
 GDAL_EXTRA_LIBS="-lm ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a -ldl -lsqlite3 ${PROJ_ROOT}/lib/libproj.a ${MPI_ROOT}/lib/libmpicxx.a -lstdc++" # See also patch for configuration file ./configs/${VER%.*}/static/cmake/modules/FindGDAL.cmake; for some reason, needed to run `sudo ln -s /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so` after recent upgrades to make it so libstc++ is found
@@ -65 +67 @@
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;-L${LIBGFORTRAN_ROOT};-lgfortran" \
+        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
         -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
         -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
         -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
-        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;-L${LIBGFORTRAN_ROOT};-lgfortran" \
+        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
         -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \
         ..

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

@@ -28 +28 @@
 LIBGFORTRAN=$(find /usr /opt -name libgfortran.* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
+echo "Finding libgcc..."
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc.* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 echo "Finding libglib..."
 LIBGLIB=$(find /usr /opt -name libglib-2.0.* 2>/dev/null | egrep -n libglib-2.0.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
@@ -86 +88 @@
 cmake \
         -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a" \
+        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
         -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
         -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
@@ -92 +94 @@
         -DGLIB_INCLUDE_DIRS="${GLIB_H_DIR};${GLIBCONFIG_H_DIR}" \
         -DGLIB_LIBRARY="${LIBGLIB} ${LIBGLIB_ROOT}/libgthread-2.0.a ${LIBINTL} -liconv ${LIBPCRE} -framework Foundation" \
-        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a" \
+        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
         -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \
         ..