[Git][debian-gis-team/gmtsar][master] Update HDF5 2.1.0 patch to detect INFIX correctly. (closes: #1139600)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / gmtsar


Commits:
35fbd8f6 by Bas Couwenberg at 2026-08-07T13:35:58+02:00
Update HDF5 2.1.0 patch to detect INFIX correctly. (closes: #1139600)

- - - - -


2 changed files:

- debian/changelog
- debian/patches/0004-hdf5-2.1.0.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
 gmtsar (6.7+ds-2) UNRELEASED; urgency=medium
 
+  [ Antonio Valentino ]
   * debian/copytight:
     - Drop `pwd` from the exclusion list.
 
+  [ Bas Couwenberg ]
+  * Update HDF5 2.1.0 patch to detect INFIX correctly.
+    (closes: #1139600)
+
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 25 Jun 2026 13:58:56 +0000
 
 gmtsar (6.7+ds-1) unstable; urgency=medium


=====================================
debian/patches/0004-hdf5-2.1.0.patch
=====================================
@@ -9,27 +9,41 @@ Applied-Upstream: https://github.com/gmtsar/gmtsar/commit/564cdfc789192337c70f6f
  ax_lib_hdf5.m4 | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
 
-diff --git a/ax_lib_hdf5.m4 b/ax_lib_hdf5.m4
-index 809cf96..03f8788 100644
 --- a/ax_lib_hdf5.m4
 +++ b/ax_lib_hdf5.m4
-@@ -226,7 +226,14 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
+@@ -137,6 +137,7 @@ HDF5_LIBS=""
+ HDF5_FC=""
+ HDF5_FFLAGS=""
+ HDF5_FLIBS=""
++HDF5_INFIX=""
+ 
+ dnl Try and find hdf5 compiler tools and options.
+ if test "$with_hdf5" = "yes"; then
+@@ -226,7 +227,15 @@ HDF5 support is being disabled (equivale
            esac
          done
  
 -        HDF5_LIBS="$HDF5_LIBS -lhdf5"
-+        HDF5_INFIX=
-+        case "$HDF5_LIBS" in
++        for arg in $HDF5_LIBS ; do
++          case "$arg" in
 +            -lhdf5_*)
-+                HDF5_INFIX="${HDF5_LIBS#-lhdf5_}"
++                HDF5_INFIX="${arg#-lhdf5_}"
 +                HDF5_INFIX="_${HDF5_INFIX%%_*}"
 +                ;;
-+        esac
++          esac
++        done
 +        HDF5_LIBS="$HDF5_LIBS -lhdf5$HDF5_INFIX"
          AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
  
          dnl See if we can compile
-@@ -245,7 +252,7 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
+@@ -239,13 +248,13 @@ HDF5 support is being disabled (equivale
+         LIBS=$HDF5_LIBS
+         LDFLAGS=$HDF5_LDFLAGS
+         AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no])
+-        AC_CHECK_LIB([hdf5], [H5Fcreate], [ac_cv_libhdf5=yes],
++        AC_CHECK_LIB([hdf5${HDF5_INFIX}], [H5Fcreate], [ac_cv_libhdf5=yes],
+                      [ac_cv_libhdf5=no])
+         if test "$ac_cv_hadf5_h" = "no" && test "$ac_cv_libhdf5" = "no" ; then
            AC_MSG_WARN([Unable to compile HDF5 test program])
          fi
          dnl Look for HDF5's high level library
@@ -38,7 +52,7 @@ index 809cf96..03f8788 100644
  
          CC=$ax_lib_hdf5_save_CC
          CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS
-@@ -281,9 +288,9 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
+@@ -281,9 +290,9 @@ HDF5 support is being disabled (equivale
              for arg in $HDF5_LIBS
              do
                case "$arg" in #(



View it on GitLab: https://salsa.debian.org/debian-gis-team/gmtsar/-/commit/35fbd8f68d16b2fb4b397f7aeb2c1f7c86706d7c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gmtsar/-/commit/35fbd8f68d16b2fb4b397f7aeb2c1f7c86706d7c
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260807/5bb9fe08/attachment-0001.htm>