summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorQuellynSnead <quellyn@lanl.gov>2020-12-24 21:35:19 -0700
committerGitHub <noreply@github.com>2020-12-24 22:35:19 -0600
commit6684cb165abf22373c3a24cfe75cf8a9cb840239 (patch)
treebd29756c573d8765a16e9c7d625a067303d622d5 /var
parentc214e4dd2d2215d2a668481e8f7c3a1e1fbe0fae (diff)
downloadspack-6684cb165abf22373c3a24cfe75cf8a9cb840239.tar.gz
spack-6684cb165abf22373c3a24cfe75cf8a9cb840239.tar.bz2
spack-6684cb165abf22373c3a24cfe75cf8a9cb840239.tar.xz
spack-6684cb165abf22373c3a24cfe75cf8a9cb840239.zip
Starting with HDF5 1.10.0, the H5FD_class_t structure has a new (#20529)
"terminate" member. Initialize it to NULL.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/silo/H5FD_class_t-terminate.patch12
-rw-r--r--var/spack/repos/builtin/packages/silo/package.py1
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/silo/H5FD_class_t-terminate.patch b/var/spack/repos/builtin/packages/silo/H5FD_class_t-terminate.patch
new file mode 100644
index 0000000000..02df290b5b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/silo/H5FD_class_t-terminate.patch
@@ -0,0 +1,12 @@
+diff --git a/src/hdf5_drv/H5FDsilo.c b/src/hdf5_drv/H5FDsilo.c
+index 840dfd0..0d09147 100644
+--- a/src/hdf5_drv/H5FDsilo.c
++++ b/src/hdf5_drv/H5FDsilo.c
+@@ -500,6 +500,7 @@ static const H5FD_class_t H5FD_silo_g = {
+ "silo", /*name */
+ MAXADDR, /*maxaddr */
+ H5F_CLOSE_WEAK, /* fc_degree */
++ NULL, /*terminate */
+ H5FD_silo_sb_size, /*sb_size */
+ H5FD_silo_sb_encode, /*sb_encode */
+ H5FD_silo_sb_decode, /*sb_decode */
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py
index 3d9ef4e16c..29a921ae66 100644
--- a/var/spack/repos/builtin/packages/silo/package.py
+++ b/var/spack/repos/builtin/packages/silo/package.py
@@ -38,6 +38,7 @@ class Silo(AutotoolsPackage):
depends_on('zlib')
patch('remove-mpiposix.patch', when='@4.8:4.10.2')
+ patch('H5FD_class_t-terminate.patch', when='^hdf5@1.10.0:')
def flag_handler(self, name, flags):
spec = self.spec