[med-svn] [Git][med-team/libminc][master] Use HDF5's CONFIG-mode across libminc's build and its exports
Dominique Belhachemi (@domibel)
gitlab at salsa.debian.org
Sun Sep 13 02:10:27 BST 2026
Dominique Belhachemi pushed to branch master at Debian Med / libminc
Commits:
a4a59591 by Dominique Belhachemi at 2026-09-12T21:07:17-04:00
Use HDF5's CONFIG-mode across libminc's build and its exports
- - - - -
4 changed files:
- debian/changelog
- debian/patches/0006-Drop-hdf5-from_LIBMINC_LIBRARIES_CONFIG.patch → debian/patches/0006-use-hdf5-config-mode.patch
- − debian/patches/0008-hdf5-2.1.0.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
libminc (2.5.0-4) UNRELEASED; urgency=medium
+ * Team upload.
+
+ [ Andreas Tille ]
* Fix DEP3
- -- Andreas Tille <tille at debian.org> Sat, 18 Jul 2026 07:31:40 +0200
+ [ Dominique Belhachemi ]
+ * Use HDF5's CONFIG-mode across libminc's build and its exports
+
+ -- Dominique Belhachemi <domibel at debian.org> Sat, 12 Sep 2026 20:35:52 -0400
libminc (2.5.0-3) unstable; urgency=medium
=====================================
debian/patches/0006-Drop-hdf5-from_LIBMINC_LIBRARIES_CONFIG.patch → debian/patches/0006-use-hdf5-config-mode.patch
=====================================
@@ -1,18 +1,26 @@
-From: Gilles Filippini <pini at debian.org>
-Date: Sat, 9 May 2026 11:15:00 -0500
-Subject: Support for cmake built HDF5 - Fix insighttoolkit5 FTBFS
-
-Last-Update: 2025-11-12
+Description: Use HDF5's own CONFIG-mode consistently
+ Unset HDF5_NO_FIND_PACKAGE_CONFIG_FILE to use HDF5's own CONFIG-mode
+ Don't leak HDF5's CONFIG-mode target names into LIBMINC_LIBRARIES_CONFIG
+ Don't force downstream consumers of LIBMINCConfig.cmake into MODULE-mode
+Author: Gilles Filippini <pini at debian.org>
+Author: Dominique Belhachemi <domibel at debian.org>
Bug-Debian: https://bugs.debian.org/1120574
+Bug-Debian: https://bugs.debian.org/1139618
+Bug-Debian: https://bugs.debian.org/1147167
+Forwarded: not-yet
+Last-Update: 2026-09-12
---
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d4fb033..adfc5e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -396,8 +396,8 @@ get_filename_component(HDF5_LIBRARY_NAME "${HDF5_LIBRARY}" NAME)
+@@ -81,7 +81,6 @@
+
+ # external packages
+ find_package(ZLIB REQUIRED)
+- set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON)
+ find_package(HDF5 REQUIRED COMPONENTS C )
+
+ if(LIBMINC_USE_NIFTI)
+@@ -396,8 +395,8 @@
get_filename_component(ZLIB_LIBRARY_NAME "${ZLIB_LIBRARY}" NAME)
# Backward-compat: keep flat library list variables populated
@@ -23,3 +31,30 @@ index d4fb033..adfc5e9 100644
message("LIBMINC_LIBRARIES_CONFIG=${LIBMINC_LIBRARIES_CONFIG}")
set(LIBMINC_STATIC_LIBRARIES ${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY})
+--- a/LIBMINCConfig.cmake.in
++++ b/LIBMINCConfig.cmake.in
+@@ -33,24 +33,6 @@
+ # ----- Resolve transitive dependencies -----
+ find_dependency(ZLIB REQUIRED)
+
+-set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON)
+-# Provide hints so the system FindHDF5 can find the same HDF5 we were built with
+-# (especially important on Debian/Ubuntu where the serial variant lives in
+-# non-standard paths like /usr/include/hdf5/serial)
+-set(_LIBMINC_SAVED_HDF5_INCLUDE_DIR "@HDF5_INCLUDE_DIR@")
+-set(_LIBMINC_SAVED_HDF5_LIBRARY "@HDF5_LIBRARY@")
+-if(_LIBMINC_SAVED_HDF5_INCLUDE_DIR)
+- if(NOT HDF5_C_INCLUDE_DIR)
+- set(HDF5_C_INCLUDE_DIR "${_LIBMINC_SAVED_HDF5_INCLUDE_DIR}" CACHE PATH "HDF5 C include dir (from libminc)")
+- endif()
+-endif()
+-if(_LIBMINC_SAVED_HDF5_LIBRARY)
+- if(NOT HDF5_hdf5_LIBRARY_RELEASE)
+- set(HDF5_hdf5_LIBRARY_RELEASE "${_LIBMINC_SAVED_HDF5_LIBRARY}" CACHE FILEPATH "HDF5 C library (from libminc)")
+- endif()
+-endif()
+-unset(_LIBMINC_SAVED_HDF5_INCLUDE_DIR)
+-unset(_LIBMINC_SAVED_HDF5_LIBRARY)
+ find_dependency(HDF5 REQUIRED COMPONENTS C)
+
+ if(HAVE_MINC1)
=====================================
debian/patches/0008-hdf5-2.1.0.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Author: Gilles Filippini <pini at debian.org>
-Last-Update: 2026-06-10
-Bug-Debian: https://bugs.debian.org/1139618
-Description: Build against against HDF5 2.1.0
-
-Index: libminc-2.5.0/CMakeLists.txt
-===================================================================
---- libminc-2.5.0.orig/CMakeLists.txt
-+++ libminc-2.5.0/CMakeLists.txt
-@@ -81,7 +81,6 @@ if(NOT LIBMINC_EXTERNALLY_CONFIGURED)
-
- # external packages
- find_package(ZLIB REQUIRED)
-- set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON)
- find_package(HDF5 REQUIRED COMPONENTS C )
-
- if(LIBMINC_USE_NIFTI)
=====================================
debian/patches/series
=====================================
@@ -2,6 +2,5 @@
0003-disable-dimension-test.patch
0004-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
0005-Disable-setting-RPATH.patch
-0006-Drop-hdf5-from_LIBMINC_LIBRARIES_CONFIG.patch
+0006-use-hdf5-config-mode.patch
0007-Install-cmake-in-LIBMINC
-0008-hdf5-2.1.0.patch
View it on GitLab: https://salsa.debian.org/med-team/libminc/-/commit/a4a59591d1edb715e48b967138fb93d3fd148b81
--
View it on GitLab: https://salsa.debian.org/med-team/libminc/-/commit/a4a59591d1edb715e48b967138fb93d3fd148b81
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/debian-med-commit/attachments/20260913/990ae8fd/attachment-0001.htm>
More information about the debian-med-commit
mailing list