From 6684cb165abf22373c3a24cfe75cf8a9cb840239 Mon Sep 17 00:00:00 2001 From: QuellynSnead Date: Thu, 24 Dec 2020 21:35:19 -0700 Subject: Starting with HDF5 1.10.0, the H5FD_class_t structure has a new (#20529) "terminate" member. Initialize it to NULL. --- .../repos/builtin/packages/silo/H5FD_class_t-terminate.patch | 12 ++++++++++++ var/spack/repos/builtin/packages/silo/package.py | 1 + 2 files changed, 13 insertions(+) create mode 100644 var/spack/repos/builtin/packages/silo/H5FD_class_t-terminate.patch 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 -- cgit v1.2.3-60-g2f50