Control: tags -1 + patch Le 2024-08-17 15:42, Gilles Filippini a écrit :
Source: silo-llnl Version: 4.11-6 Severity: importantHi,The silo-llnl package fails to build from source in a test rebuild againsthdf5 1.14 currently in experimental:libtool: compile: mpicc -DHAVE_CONFIG_H -I. -I../.. -I./../silo -I./../silo -I./../fpzip -DH5_HAVE_FILTER_ZFP -DH5Z_ZFP_AS_LIB -DAS_SILO_BUILTIN -I./../zfp-0.5.5/include -I/usr/include/hdf5/openmpi -I/usr/inclu de/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/lib/openmpi/include -Wdate-time -D_FORTIFY_SOURCE =2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -fPIC -D_LARGEFILE_SOURCE - D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement -c H5FDsilo.c -fPIC -DPIC -o .libs/H5FDsilo.o H5FDsilo.c:502:5: error: initialization of 'unsigned int' from 'char *' makes integer from pointer without a cast [-Wint-conversion] 502 | "silo", /*name */| ^~~~~~ H5FDsilo.c:502:5: note: (near initialization for 'H5FD_silo_g.version')H5FDsilo.c:502:5: error: initializer element is not computable at load timeH5FDsilo.c:502:5: note: (near initialization for 'H5FD_silo_g.version')H5FDsilo.c:463:17: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '9223372036854775807' to '-1' [-Woverflow]463 | #define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1) | ^ H5FDsilo.c:503:5: note: in expansion of macro 'MAXADDR'503 | MAXADDR, /*maxaddr */| ^~~~~~~H5FDsilo.c:504:5: error: initialization of 'const char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 504 | H5F_CLOSE_WEAK, /* fc_degree */| ^~~~~~~~~~~~~~ H5FDsilo.c:504:5: note: (near initialization for 'H5FD_silo_g.name')H5FDsilo.c:508:5: error: incompatible types when initializing type 'enum H5F_close_degree_t' using type 'hsize_t (*)(H5FD_t *)' {aka 'long unsigned int (*)(H5FD_t *)'} 508 | H5FD_silo_sb_size, /*sb_size */| ^~~~~~~~~~~~~~~~~H5FDsilo.c:509:5: error: initialization of 'herr_t (*)(void)' {aka 'int (*)(void)'} from incompatible pointer type 'herr_t (*)(H5FD_t *, char *, unsigned char *)' {aka 'int (*)(H5FD_t *, char *, unsigned char *)'} [-Wincompatible-pointer-types] 509 | H5FD_silo_sb_encode, /*sb_encode */| ^~~~~~~~~~~~~~~~~~~H5FDsilo.c:509:5: note: (near initialization for 'H5FD_silo_g.terminate') libtool: compile: mpicc -DHAVE_CONFIG_H -I. -I../.. -I./../silo -I./../silo -I./../fpzip -DH5_HAVE_FILTER_ZFP -DH5Z_ZFP_AS_LIB -DAS_SILO_BUILTIN -I./../zfp-0.5.5/include -I/usr/include/hdf5/openmpi -I/usr/inclu de/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/lib/openmpi/include -Wdate-time -D_FORTIFY_SOURCE =2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -fPIC -D_LARGEFILE_SOURCE - D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wdeclaration-after-statement -c H5FDsilo.c -fPIC -DPIC -o .libs/H5FDsilo.o H5FDsilo.c:502:5: error: initialization of 'unsigned int' from 'char *' makes integer from pointer without a cast [-Wint-conversion] 502 | "silo", /*name */| ^~~~~~ H5FDsilo.c:502:5: note: (near initialization for 'H5FD_silo_g.version')H5FDsilo.c:502:5: error: initializer element is not computable at load timeH5FDsilo.c:502:5: note: (near initialization for 'H5FD_silo_g.version')H5FDsilo.c:463:17: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '9223372036854775807' to '-1' [-Woverflow]463 | #define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1) | ^ H5FDsilo.c:503:5: note: in expansion of macro 'MAXADDR'503 | MAXADDR, /*maxaddr */| ^~~~~~~H5FDsilo.c:504:5: error: initialization of 'const char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 504 | H5F_CLOSE_WEAK, /* fc_degree */| ^~~~~~~~~~~~~~ H5FDsilo.c:504:5: note: (near initialization for 'H5FD_silo_g.name')H5FDsilo.c:508:5: error: incompatible types when initializing type 'enum H5F_close_degree_t' using type 'hsize_t (*)(H5FD_t *)' {aka 'long unsigned int (*)(H5FD_t *)'} 508 | H5FD_silo_sb_size, /*sb_size */| ^~~~~~~~~~~~~~~~~H5FDsilo.c:509:5: error: initialization of 'herr_t (*)(void)' {aka 'int (*)(void)'} from incompatible pointer type 'herr_t (*)(H5FD_t *, char *, unsigned char *)' {aka 'int (*)(H5FD_t *, char *, unsigned char *)'} [-Wincompatible-pointer-types] 509 | H5FD_silo_sb_encode, /*sb_encode */| ^~~~~~~~~~~~~~~~~~~H5FDsilo.c:509:5: note: (near initialization for 'H5FD_silo_g.terminate')
Please find attached a patch proposal. I've backported a couple of upstream fixes.
Thanks, _g.
diff -Nru silo-llnl-4.11/debian/changelog silo-llnl-4.11/debian/changelog
--- silo-llnl-4.11/debian/changelog 2024-08-09 19:37:59.000000000 +0200
+++ silo-llnl-4.11/debian/changelog 2024-11-17 21:10:08.000000000 +0100
@@ -1,3 +1,10 @@
+silo-llnl (4.11-6.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Patch hdf5-1.14.patch to support HDF5 1.14. Closes: #1078904
+
+ -- Gilles Filippini <p...@debian.org> Sun, 17 Nov 2024 21:10:08 +0100
+
silo-llnl (4.11-6) unstable; urgency=medium
* gcc-14.patch: Fix FTBFS with gcc 14. Closes: #1075509
diff -Nru silo-llnl-4.11/debian/patches/hdf5-1.14.patch silo-llnl-4.11/debian/patches/hdf5-1.14.patch
--- silo-llnl-4.11/debian/patches/hdf5-1.14.patch 1970-01-01 01:00:00.000000000 +0100
+++ silo-llnl-4.11/debian/patches/hdf5-1.14.patch 2024-11-17 21:10:08.000000000 +0100
@@ -0,0 +1,41 @@
+Description: backport of upstream patches to support HDF5 1.14
+ * Commit 5dc160c
+ * Commit 3103c01
+Index: silo-llnl-4.11/src/hdf5_drv/H5FDsilo.c
+===================================================================
+--- silo-llnl-4.11.orig/src/hdf5_drv/H5FDsilo.c
++++ silo-llnl-4.11/src/hdf5_drv/H5FDsilo.c
+@@ -499,6 +499,12 @@ static herr_t H5FD_silo_truncate(H5FD_t
+
+
+ static const H5FD_class_t H5FD_silo_g = {
++#if HDF5_VERSION_GE(1,13,2) && defined(H5FD_CLASS_VERSION)
++ H5FD_CLASS_VERSION, /*version */
++#endif
++#if HDF5_VERSION_GE(1,13,0)
++ 512, /*value */
++#endif
+ "silo", /*name */
+ MAXADDR, /*maxaddr */
+ H5F_CLOSE_WEAK, /* fc_degree */
+@@ -528,10 +534,20 @@ static const H5FD_class_t H5FD_silo_g =
+ H5FD_silo_get_handle, /*get_handle */
+ H5FD_silo_read, /*read */
+ H5FD_silo_write, /*write */
++#if HDF5_VERSION_GE(1,13,3) && defined(H5FD_CLASS_VERSION)
++ NULL, /*read_vector*/
++ NULL, /*write_vector*/
++ NULL, /*read_selection*/
++ NULL, /*write_selection*/
++#endif
+ NULL, /*flush */
+ H5FD_silo_truncate, /*truncate */
+ NULL, /*lock */
+ NULL, /*unlock */
++#if HDF5_VERSION_GE(1,13,0)
++ NULL, /*del */
++ NULL, /*ctl */
++#endif
+ H5FD_FLMAP_SINGLE /*fl_map */
+ };
+
diff -Nru silo-llnl-4.11/debian/patches/series silo-llnl-4.11/debian/patches/series
--- silo-llnl-4.11/debian/patches/series 2024-08-09 19:37:59.000000000 +0200
+++ silo-llnl-4.11/debian/patches/series 2024-11-17 21:10:08.000000000 +0100
@@ -9,3 +9,4 @@
g++-12-fix.patch
implicit-fn-decl.patch
gcc-14.patch
+hdf5-1.14.patch
signature.asc
Description: OpenPGP digital signature
