[Git][debian-gis-team/gmtsar][master] Fix FTBFS against HDF5 2.1.0. (closes: #1139600)

[Bas Couwenberg (@sebastic)]

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


Commits:
4ad9453f by Bas Couwenberg at 2026-06-10T09:56:21+02:00
Fix FTBFS against HDF5 2.1.0. (closes: #1139600)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/hdf5-2.1.0.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
 gmtsar (6.6+ds-2) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Bas Couwenberg ]
   * Use test-build-validate-cleanup instead of test-build-twice.
   * Drop Priority: optional, default since dpkg 1.22.13.
   * Bump Standards-Version to 4.7.4, changes: priority.
   * Don't remove symlink in clean target.
 
+  [ Gilles Filippini ]
+  * Fix FTBFS against HDF5 2.1.0.
+    (closes: #1139600)
+
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Oct 2025 12:57:20 +0200
 
 gmtsar (6.6+ds-1) unstable; urgency=medium


=====================================
debian/patches/hdf5-2.1.0.patch
=====================================
@@ -0,0 +1,55 @@
+Description: Add support for HDF5 2.1.0.
+Author: Gilles Filippini <pini at debian.org>
+Bug-Debian: https://bugs.debian.org/1139600
+Forwarded: https://github.com/gmtsar/gmtsar/pull/1117
+
+--- a/ax_lib_hdf5.m4
++++ b/ax_lib_hdf5.m4
+@@ -226,7 +226,14 @@ HDF5 support is being disabled (equivale
+           esac
+         done
+ 
+-        HDF5_LIBS="$HDF5_LIBS -lhdf5"
++        HDF5_INFIX=
++        case "$HDF5_LIBS" in
++            -lhdf5_*)
++                HDF5_INFIX="${HDF5_LIBS#-lhdf5_}"
++                HDF5_INFIX="_${HDF5_INFIX%%_*}"
++                ;;
++        esac
++        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 (equivale
+           AC_MSG_WARN([Unable to compile HDF5 test program])
+         fi
+         dnl Look for HDF5's high level library
+-        AC_CHECK_LIB([hdf5_hl], [H5TBread_table], [HDF5_LIBS="$HDF5_LIBS -lhdf5_hl"], [], [])
++        AC_CHECK_LIB([hdf5${HDF5_INFIX}_hl], [H5TBread_table], [HDF5_LIBS="$HDF5_LIBS -lhdf5${HDF5_INFIX}_hl"], [], [])
+ 
+         CC=$ax_lib_hdf5_save_CC
+         CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS
+@@ -281,9 +288,9 @@ HDF5 support is being disabled (equivale
+             for arg in $HDF5_LIBS
+             do
+               case "$arg" in #(
+-                -lhdf5_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5hl_fortran $arg"
++                -lhdf5${HDF5_INFIX}_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5${HDF5_INFIX}_hl_fortran $arg"
+                   ;; #(
+-                -lhdf5)    HDF5_FLIBS="$HDF5_FLIBS -lhdf5_fortran $arg"
++                -lhdf5${HDF5_INFIX})    HDF5_FLIBS="$HDF5_FLIBS -lhdf5${HDF5_INFIX}_fortran $arg"
+                   ;; #(
+                 *) HDF5_FLIBS="$HDF5_FLIBS $arg"
+                   ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -153,7 +153,7 @@ dnl ------------------------------------
+ dnl Set the HDF5 include and lib stuff
+ dnl ------------------------------------------------------------------
+ AX_LIB_HDF5()
+-HDF5_LIBS="$HDF5_LIBS -lhdf5_cpp"	# Add the C++ library
++HDF5_LIBS="$HDF5_LIBS -lhdf5${HDF5_INFIX}_cpp"	# Add the C++ library
+ AC_MSG_CHECKING(for HDF5 include)
+ AC_MSG_RESULT($HDF5_CPPFLAGS)
+ AC_MSG_CHECKING(for HDF5 libs)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 0001-No-snaphu-and-epr-api.patch
 0002-Fix-interpreter.patch
 0003-Clean.patch
+hdf5-2.1.0.patch



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gmtsar/-/commit/4ad9453f154c39b7d1aa0acc580fde34d087cbd7
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/20260610/f53c20ae/attachment-0001.htm>