Changeset 27151

Timestamp:

07/08/22 20:30:22 (3 years ago)

Author:

jdquinn

Message:

BUG: Correcting some static linking in distributables; typo

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (2 diffs)
• externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake (modified) (1 diff)
• externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake (modified) (1 diff)
• externalpackages/gmt/install-6-mac-static.sh (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -469 +469 @@
 if [ -d "${NETCDF_ROOT}" ]; then
         export NETCDF_ROOT # Used in installation of GDAL, GMT
-        path_append "${NETCDF_ROOT}/bin"
-        cpath_append "${NETCDF_ROOT}/include"
-        library_path_append "${NETCDF_ROOT}/lib"
-        dyld_library_path_append "${NETCDF_ROOT}/lib"
-        ld_library_path_append "${NETCDF_ROOT}/lib"
+        path_prepend "${NETCDF_ROOT}/bin"
+        cpath_prepend "${NETCDF_ROOT}/include"
+        library_path_prepend "${NETCDF_ROOT}/lib"
+        dyld_library_path_prepend "${NETCDF_ROOT}/lib"
+        ld_library_path_prepend "${NETCDF_ROOT}/lib"
 fi
 
@@ -491 +491 @@
 if [ -d "${CURL_ROOT}" ]; then
         export CURL_ROOT # Used in installation of NetCDF, GDAL, GMT
-        ld_library_path_append "${CURL_ROOT}/lib"
-        dyld_library_path_append "${CURL_ROOT}/lib"
+        cpath_prepend "${CURL_ROOT}/include"
+        ld_library_path_prepend "${CURL_ROOT}/lib"
+        dyld_library_path_prepend "${CURL_ROOT}/lib"
         path_append "${CURL_ROOT}/bin"
 fi

issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake

@@ -148 +148 @@
                 NAMES ${_extralib}
                 HINTS
+                ${NETCDF_ROOT}
+                $ENV{NETCDF_ROOT}
                 ${HDF5_ROOT}
                 $ENV{HDF5_ROOT}

issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake

@@ -130 +130 @@
 # find all manually-supplied libs
 if (NETCDF_EXTRA_LIBS)
-        # Ensure -l is precedeced by whitespace to not match
+        # Ensure -l is preceded by whitespace to not match
         # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
         string (REGEX MATCHALL "(^| )-l[^ ]+" _netcdf_extra_lib_dashl ${NETCDF_EXTRA_LIBS})

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

@@ -20 +20 @@
 LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | grep -n libgcc.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
 
-GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6.0/static/cmake/modules/FindGDAL.cmake)
-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)
+GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake)
+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/static/cmake/modules/FindNETCDF.cmake)
 
 # Environment