diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2024-01-02 14:08:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-02 14:08:20 -0600 |
| commit | 2e639f82c7a5594b5d39428aeae58a9a2b9ae214 (patch) | |
| tree | 6df68265d35eaf06525b7e68df69b524aed0f36d /var/spack/repos/builtin/packages/h5z-zfp/config.make.patch | |
| parent | 63bad7cd79ad2d4412158965b01aea71f8783221 (diff) | |
| download | spack-2e639f82c7a5594b5d39428aeae58a9a2b9ae214.tar.gz spack-2e639f82c7a5594b5d39428aeae58a9a2b9ae214.tar.bz2 spack-2e639f82c7a5594b5d39428aeae58a9a2b9ae214.tar.xz spack-2e639f82c7a5594b5d39428aeae58a9a2b9ae214.zip | |
Change h5z-zfp from MakefilePackage to CMakePackage. (#41890)
Remove versions before 1.1.0 that do not support CMake.
Remove patches for the removed versions.
Diffstat (limited to 'var/spack/repos/builtin/packages/h5z-zfp/config.make.patch')
| -rw-r--r-- | var/spack/repos/builtin/packages/h5z-zfp/config.make.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/var/spack/repos/builtin/packages/h5z-zfp/config.make.patch b/var/spack/repos/builtin/packages/h5z-zfp/config.make.patch deleted file mode 100644 index 4879a1b755..0000000000 --- a/var/spack/repos/builtin/packages/h5z-zfp/config.make.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/config.make b/config.make -index d782bd1..1c53ab8 100644 ---- a/config.make -+++ b/config.make -@@ -128,18 +128,37 @@ ZFP_INC = $(ZFP_HOME)/inc - else - ZFP_INC = $(ZFP_HOME)/include - endif -+ifeq ($(wildcard $(ZFP_HOME)/lib),) -+ZFP_LIB = $(ZFP_HOME)/lib64 -+else - ZFP_LIB = $(ZFP_HOME)/lib -+endif -+ -+# Check if specified individually the HDF5 include directory, -+# library directory and bin directory separated by commas, i.e. HDF5_HOME=INC,LIB,BIN - --HDF5_INC = $(HDF5_HOME)/include --HDF5_LIB = $(HDF5_HOME)/lib --HDF5_BIN = $(HDF5_HOME)/bin -+ifneq (,$(findstring ",",$(HDF5_HOME))) -+ HDF5_INC = $(shell echo $(HDF5_HOME) | awk -F'[,]' '{print $$1}') -+ HDF5_LIB = $(shell echo $(HDF5_HOME) | awk -F'[,]' '{print $$2}') -+ HDF5_BIN = $(shell echo $(HDF5_HOME) | awk -F'[,]' '{print $$3}') -+ MAKEVARS = -+else -+ HDF5_INC = $(HDF5_HOME)/include -+ ifeq ($(wildcard $(HDF5_HOME)/lib),) -+ HDF5_LIB = $(HDF5_HOME)/lib64 -+ else -+ HDF5_LIB = $(HDF5_HOME)/lib -+ endif -+ HDF5_BIN = $(HDF5_HOME)/bin -+ MAKEVARS = HDF5_HOME=$(HDF5_HOME) -+endif - - ifeq ($(PREFIX),) - PREFIX := $(shell pwd)/install - endif - INSTALL ?= install - --MAKEVARS = ZFP_HOME=$(ZFP_HOME) HDF5_HOME=$(HDF5_HOME) PREFIX=$(PREFIX) -+MAKEVARS += ZFP_HOME=$(ZFP_HOME) PREFIX=$(PREFIX) - - .SUFFIXES: - .SUFFIXES: .c .F90 .h .o .mod |