Changeset 28164

Timestamp:

03/21/24 14:50:40 (20 months ago)

Author:

jdquinn

Message:

CHG: Issues with whitespace in patch; path to config files

Location:

issm/trunk-jpl/externalpackages/gmt

Files:

• configs/6.5/static/cmake/modules/FindGDAL.cmake.patch (modified) (2 diffs)
• install-6-linux-static.sh (modified) (1 diff)
• install-6-linux.sh (modified) (1 diff)

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

@@ -1 @@
---- src/cmake/modules/FindGDAL.cmake    2024-03-20 19:47:15
-+++ FindGDAL.cmake  2024-03-20 19:55:54
+--- src/cmake/modules/FindGDAL.cmake    2024-03-20 19:47:15
++++ FindGDAL.cmake      2024-03-20 19:55:54
 @@ -81,12 +81,25 @@
-               ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
-               OUTPUT_VARIABLE GDAL_CONFIG_LIBS)
-          if (GDAL_CONFIG_LIBS)
--              string (REGEX MATCHALL "-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
--              string (REGEX REPLACE "-l" "" _gdal_lib "${_gdal_dashl}")
--              string (REGEX MATCHALL "-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS})
--              string (REGEX REPLACE "-L" "" _gdal_libpath "${_gdal_dashL}")
-+              string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
-+              string (REGEX REPLACE "(^| )-l" "" _gdal_lib "${_gdal_dashl}")
-+              string (REGEX MATCHALL "(^| )-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS})
-+              string (REGEX REPLACE "(^| )-L" "" _gdal_libpath "${_gdal_dashL}")
-          endif (GDAL_CONFIG_LIBS)
-+         execute_process (COMMAND ${GDAL_CONFIG} --dep-libs
-+              ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
-+              OUTPUT_VARIABLE GDAL_CONFIG_DEP_LIBS)
-+         if (GDAL_CONFIG_DEP_LIBS)
-+              string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_DEP_LIBS})
-+              string (REGEX REPLACE "(^| )-l" "" _gdal_dep_lib "${_gdal_dashl}")
-+              string (REGEX MATCHALL "(^| )-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_DEP_LIBS})
-+              string (REGEX REPLACE "(^| )-L" "" _gdal_dep_libpath "${_gdal_dashL}")
-+         endif (GDAL_CONFIG_DEP_LIBS)
-     endif (GDAL_CONFIG)
-+    if (_gdal_dep_lib)
-+         list (REMOVE_DUPLICATES _gdal_dep_lib)
-+         list (REMOVE_ITEM _gdal_dep_lib gdal)
-+    endif (_gdal_dep_lib)
+                        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+                        OUTPUT_VARIABLE GDAL_CONFIG_LIBS)
+                if (GDAL_CONFIG_LIBS)
+-                       string (REGEX MATCHALL "-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
+-                       string (REGEX REPLACE "-l" "" _gdal_lib "${_gdal_dashl}")
+-                       string (REGEX MATCHALL "-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS})
+-                       string (REGEX REPLACE "-L" "" _gdal_libpath "${_gdal_dashL}")
++                       string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
++                       string (REGEX REPLACE "(^| )-l" "" _gdal_lib "${_gdal_dashl}")
++                       string (REGEX MATCHALL "(^| )-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS})
++                       string (REGEX REPLACE "(^| )-L" "" _gdal_libpath "${_gdal_dashL}")
+                endif (GDAL_CONFIG_LIBS)
++               execute_process (COMMAND ${GDAL_CONFIG} --dep-libs
++                       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
++                       OUTPUT_VARIABLE GDAL_CONFIG_DEP_LIBS)
++               if (GDAL_CONFIG_DEP_LIBS)
++                       string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_DEP_LIBS})
++                       string (REGEX REPLACE "(^| )-l" "" _gdal_dep_lib "${_gdal_dashl}")
++                       string (REGEX MATCHALL "(^| )-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_DEP_LIBS})
++                       string (REGEX REPLACE "(^| )-L" "" _gdal_dep_libpath "${_gdal_dashL}")
++               endif (GDAL_CONFIG_DEP_LIBS)
+        endif (GDAL_CONFIG)
++       if (_gdal_dep_lib)
++               list (REMOVE_DUPLICATES _gdal_dep_lib)
++               list (REMOVE_ITEM _gdal_dep_lib gdal)
++       endif (_gdal_dep_lib)
  endif (UNIX AND NOT GDAL_FOUND)
  
  find_path (GDAL_INCLUDE_DIR gdal.h
 @@ -129,6 +142,46 @@
-     /usr/local
+        /usr/local
  )
  
 +# find all libs that gdal-config --dep-libs reports
 +foreach (_extralib ${_gdal_dep_lib})
-+    find_library (_found_lib_${_extralib}
-+         NAMES ${_extralib}
-+         HINTS
-+         ${HDF5_ROOT}
-+         $ENV{HDF5_ROOT}
-+         ${NETCDF_ROOT}
-+         $ENV{NETCDF_ROOT}
-+         ${ZLIB_ROOT}
-+         $ENV{ZLIB_ROOT}
-+         ${CURL_ROOT}
-+         $ENV{CURL_ROOT}
-+         PATH_SUFFIXES lib
-+         PATHS 
-+         ${_gdal_dep_libpath}
-+    )
-+    list (APPEND GDAL_LIBRARY ${_found_lib_${_extralib}})
++       find_library (_found_lib_${_extralib}
++               NAMES ${_extralib}
++               HINTS
++               ${HDF5_ROOT}
++               $ENV{HDF5_ROOT}
++               ${NETCDF_ROOT}
++               $ENV{NETCDF_ROOT}
++               ${ZLIB_ROOT}
++               $ENV{ZLIB_ROOT}
++               ${CURL_ROOT}
++               $ENV{CURL_ROOT}
++               PATH_SUFFIXES lib
++               PATHS 
++               ${_gdal_dep_libpath}
++       )
++       list (APPEND GDAL_LIBRARY ${_found_lib_${_extralib}})
 +endforeach (_extralib)
 +
@@ -58 +58 @@
 +# find all manually-supplied libs
 +if (GDAL_EXTRA_LIBS)
-+    # Ensure -l is preceded by whitespace to not match
-+    # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
-+    string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_extra_lib_dashl ${GDAL_EXTRA_LIBS})
-+    string (REGEX REPLACE "(^| )-l" "" _gdal_extra_lib "${_gdal_extra_lib_dashl}")
-+    string (REGEX MATCHALL "(^| )-L[^ ]+" _gdal_extra_lib_dashL ${GDAL_EXTRA_LIBS})
-+    string (REGEX REPLACE "(^| )-L" "" _gdal_extra_libpath "${_gdal_extra_lib_dashL}")
-+    foreach (_extralib ${_gdal_extra_lib})
-+         find_library (_found_lib_${_extralib}
-+              NAMES ${_extralib}
-+              PATH_SUFFIXES lib
-+              PATHS 
-+              ${_gdal_extra_libpath}
-+         )
-+         list (APPEND GDAL_LIBRARY ${_found_lib_${_extralib}})
-+    endforeach (_extralib)
++       # Ensure -l is preceded by whitespace to not match
++       # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
++       string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_extra_lib_dashl ${GDAL_EXTRA_LIBS})
++       string (REGEX REPLACE "(^| )-l" "" _gdal_extra_lib "${_gdal_extra_lib_dashl}")
++       string (REGEX MATCHALL "(^| )-L[^ ]+" _gdal_extra_lib_dashL ${GDAL_EXTRA_LIBS})
++       string (REGEX REPLACE "(^| )-L" "" _gdal_extra_libpath "${_gdal_extra_lib_dashL}")
++       foreach (_extralib ${_gdal_extra_lib})
++               find_library (_found_lib_${_extralib}
++                       NAMES ${_extralib}
++                       PATH_SUFFIXES lib
++                       PATHS 
++                       ${_gdal_extra_libpath}
++               )
++               list (APPEND GDAL_LIBRARY ${_found_lib_${_extralib}})
++       endforeach (_extralib)
 +endif (GDAL_EXTRA_LIBS)
 +

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

@@ -44 +44 @@
 
 # Copy custom configuration files
-cp ./configs/6/static/linux/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
+cp ./configs/6.0/static/linux/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
+cp ./configs/6.0/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
+cp ./configs/6.0/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
+cp ./configs/6.0/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
+cp ./configs/6.0/static/src/CMakeLists.txt ./src/src
 
 # Configure

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

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