diff options
| author | Justin Bedo <cu@cua0.org> | 2024-01-15 16:06:47 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2024-01-15 16:07:47 +1100 |
| commit | a947ea124a24829588decff9a604a6a88cc51ccc (patch) | |
| tree | 4fbda61dadd4fdd5f7da038eb1d40b9f2cf90c44 /pkgs/development/r-modules | |
| parent | 1030e1fc2d3a1a9d2ace11c571dc8e574ff3ad0d (diff) | |
rPackages.rhdf5filters: fix build
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/patches/rhdf5filters.patch | 67 |
1 files changed, 21 insertions, 46 deletions
diff --git a/pkgs/development/r-modules/patches/rhdf5filters.patch b/pkgs/development/r-modules/patches/rhdf5filters.patch index 93a99704302a6..1774de50a3759 100644 --- a/pkgs/development/r-modules/patches/rhdf5filters.patch +++ b/pkgs/development/r-modules/patches/rhdf5filters.patch @@ -1,58 +1,33 @@ diff --git a/src/Makevars.in b/src/Makevars.in -index dead2df..b86e3de 100644 +index 3e55470..e87daf6 100644 --- a/src/Makevars.in +++ b/src/Makevars.in -@@ -22,20 +22,19 @@ export PKG_LDFLAGS=@LDFLAGS@ +@@ -21,12 +21,12 @@ export PKG_LDFLAGS=@LDFLAGS@ all: copying $(SHLIB) #copy hdf5 library headers to package include --copying: libH5Zblosc.so libH5Zbz2.so libH5Zlzf.so -+copying: libH5Zbz2.so libH5Zlzf.so libH5Zzstd.so +-copying: libH5Zblosc.so libH5Zbz2.so libH5Zlzf.so @USE_VBZ@ ++copying: libH5Zbz2.so libH5Zlzf.so @USE_VBZ@ libH5Zzstd.so mkdir -p "${USER_LIB_DIR}" - cp ${BZIP2_LIB} "${USER_LIB_DIR}" -- cp ${BLOSC_LIB} "${USER_LIB_DIR}" - cp ${LZF_LIB} "${USER_LIB_DIR}" - # cp ${VBZ_LIB} "${USER_LIB_DIR}" - cp ${ZSTD_LIB} "${USER_LIB_DIR}" +- cp ${BZIP2_LIB} ${BLOSC_LIB} ${LZF_LIB} ${ZSTD_LIB} @VBZ_F_LIB@ "${USER_LIB_DIR}" - ++ cp ${BZIP2_LIB} ${LZF_LIB} ${ZSTD_LIB} @VBZ_F_LIB@ "${USER_LIB_DIR}" + - #libH5Zvbz.so: libH5Zzstd.so - # $(MAKE) -C vbz + libH5Zvbz.so: libH5Zzstd.so + $(MAKE) -C vbz libH5Zblosc.so: libH5Zzstd.so $(MAKE) -C blosc -- -+ - libH5Zzstd.so: - $(MAKE) -C zstd - -diff --git a/src/bzip2/Makefile b/src/bzip2/Makefile -index 449bbe7..154354e 100644 ---- a/src/bzip2/Makefile -+++ b/src/bzip2/Makefile -@@ -1,9 +1,9 @@ - - all: libH5Zbz2.so - --libH5Zbz2.so: bzip2-1.0.8/libbz2.a -- ${CC} ${PKG_CFLAGS} ${PKG_CPICFLAGS} -shared H5Zbzip2.c $(PKG_CPPFLAGS) \ -- -I./bzip2-1.0.8/ ./bzip2-1.0.8/libbz2.a ${PKG_LDFLAGS} -o libH5Zbz2.so -+libH5Zbz2.so: -+ ${CC} ${PKG_CFLAGS} ${PKG_CPICFLAGS} -shared H5Zbzip2.c \ -+ -lbz2 -o libH5Zbz2.so - - bzip2-1.0.8/libbz2.a: - $(MAKE) -C bzip2-1.0.8 -diff --git a/src/lzf/Makefile b/src/lzf/Makefile -index 837f80b..eeca0c8 100644 ---- a/src/lzf/Makefile -+++ b/src/lzf/Makefile -@@ -2,7 +2,7 @@ - all: libH5Zlzf.so - - libH5Zlzf.so: lzf/liblzf.a -- ${CC} ${PKG_CFLAGS} ${PKG_CPICFLAGS} -shared H5Zlzf.c $(PKG_CPPFLAGS) \ -+ ${CC} ${PKG_CFLAGS} ${PKG_CPICFLAGS} -shared H5Zlzf.c \ - -I./lzf/ ./lzf/liblzf.a ${PKG_LDFLAGS} -o libH5Zlzf.so - - lzf/liblzf.a: +diff --git a/src/lzf/H5Zlzf.c b/src/lzf/H5Zlzf.c +index f71caa4..87965cd 100644 +--- a/src/lzf/H5Zlzf.c ++++ b/src/lzf/H5Zlzf.c +@@ -37,7 +37,7 @@ + #include <H5PLextern.h> + #include "hdf5.h" + +-#include "lzf.h" ++#include "./lzf/lzf.h" + + #define H5Z_FILTER_LZF_VERSION 4 + #define H5Z_FILTER_LZF 32000 |