diff options
| author | Robert Blake <blake14@llnl.gov> | 2022-12-12 06:39:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 07:39:24 -0700 |
| commit | 7efcb5ae73bdaa85886079ccfd5ff0f44b838508 (patch) | |
| tree | 3dbad985a11307b5b44af7cb4ccb493502def626 /var | |
| parent | 06e63892584a72ecc983498d8ef4447fc1f15aba (diff) | |
| download | spack-7efcb5ae73bdaa85886079ccfd5ff0f44b838508.tar.gz spack-7efcb5ae73bdaa85886079ccfd5ff0f44b838508.tar.bz2 spack-7efcb5ae73bdaa85886079ccfd5ff0f44b838508.tar.xz spack-7efcb5ae73bdaa85886079ccfd5ff0f44b838508.zip | |
Fixes to the silo packages for 4.11. (#34275)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/zfp_error.patch | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 637e89623e..cbd197ad5d 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -52,7 +52,8 @@ class Silo(AutotoolsPackage): depends_on("automake", type="build", when="+shared") depends_on("libtool", type="build", when="+shared") depends_on("mpi", when="+mpi") - depends_on("hdf5@1.8:", when="+hdf5") + depends_on("hdf5@1.8", when="@:4.10+hdf5") + depends_on("hdf5@1.12:", when="@4.11:+hdf5") depends_on("qt+gui~framework@4.8:4.9", when="+silex") depends_on("libx11", when="+silex") # Xmu dependency is required on Ubuntu 18-20 @@ -84,6 +85,9 @@ class Silo(AutotoolsPackage): conflicts("+hzip", when="@4.10.2-bsd,4.11-bsd") conflicts("+fpzip", when="@4.10.2-bsd,4.11-bsd") + # zfp include missing + patch("zfp_error.patch", when="@4.11 +hdf5") + def flag_handler(self, name, flags): spec = self.spec if name == "ldflags": diff --git a/var/spack/repos/builtin/packages/silo/zfp_error.patch b/var/spack/repos/builtin/packages/silo/zfp_error.patch new file mode 100644 index 0000000000..eec4282a0b --- /dev/null +++ b/var/spack/repos/builtin/packages/silo/zfp_error.patch @@ -0,0 +1,11 @@ +diff -ru silo/src/hdf5_drv/silo_hdf5.c silo.fixed/src/hdf5_drv/silo_hdf5.c +--- silo/src/hdf5_drv/silo_hdf5.c 2021-09-09 12:35:00.000000000 -0700 ++++ silo.fixed/src/hdf5_drv/silo_hdf5.c 2022-12-02 10:34:34.560531000 -0800 +@@ -198,6 +198,7 @@ + #endif + #ifdef HAVE_ZFP + #include "H5Zzfp.h" ++extern void zfp_init_zfp(); + #endif + + /* Defining these to check overhead of PROTECT */ |