hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes to the silo packages for 4.11. (#34275)

Browse source
This commit is contained in:
Robert Blake 2022-12-12 06:39:24 -08:00 committed by GitHub
parent 06e6389258
commit 7efcb5ae73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/spack/repos/builtin/packages/silo/package.py
View file

@ -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":

11
var/spack/repos/builtin/packages/silo/zfp_error.patch Normal file
View file

@ -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 */