Fixes to the silo packages for 4.11. (#34275)
This commit is contained in:
		@@ -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
									
								
							
							
						
						
									
										11
									
								
								var/spack/repos/builtin/packages/silo/zfp_error.patch
									
									
									
									
									
										Normal 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 */
 | 
			
		||||
		Reference in New Issue
	
	Block a user