diff options
| author | Justin Bedő <cu@cua0.org> | 2023-06-04 21:23:50 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-04 21:23:50 +1000 |
| commit | 4ae814f720030aab86dfd6f4372a57da54da8427 (patch) | |
| tree | 0fe0664fb7e389b3bd950c17c4ae53612e4236dc /pkgs/development/r-modules/patches/rhdf5filters.patch | |
| parent | bbebc94fdbe117bd9ddc79b9cf4dd96829240431 (diff) | |
| parent | 8ac4225a0e0c966b943172da11c0d952c0fa9eca (diff) | |
Merge pull request #234958 from NixOS/r-updates
R,rPackages: R 4.2.3 -> 4.3.0
Diffstat (limited to 'pkgs/development/r-modules/patches/rhdf5filters.patch')
| -rw-r--r-- | pkgs/development/r-modules/patches/rhdf5filters.patch | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/patches/rhdf5filters.patch b/pkgs/development/r-modules/patches/rhdf5filters.patch index 39f09f54ceef8..93a99704302a6 100644 --- a/pkgs/development/r-modules/patches/rhdf5filters.patch +++ b/pkgs/development/r-modules/patches/rhdf5filters.patch @@ -1,19 +1,31 @@ diff --git a/src/Makevars.in b/src/Makevars.in -index 4441634..665a2dd 100644 +index dead2df..b86e3de 100644 --- a/src/Makevars.in +++ b/src/Makevars.in -@@ -20,10 +20,9 @@ export PKG_LDFLAGS=@LDFLAGS@ +@@ -22,20 +22,19 @@ export PKG_LDFLAGS=@LDFLAGS@ all: copying $(SHLIB) #copy hdf5 library headers to package include --copying: blosc/libH5Zblosc.so bzip2/libH5Zbz2.so lzf/libH5Zlzf.so -+copying: bzip2/libH5Zbz2.so lzf/libH5Zlzf.so +-copying: libH5Zblosc.so libH5Zbz2.so libH5Zlzf.so ++copying: libH5Zbz2.so libH5Zlzf.so 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}" +- ++ + #libH5Zvbz.so: libH5Zzstd.so + # $(MAKE) -C vbz + + libH5Zblosc.so: libH5Zzstd.so + $(MAKE) -C blosc +- ++ + libH5Zzstd.so: + $(MAKE) -C zstd - blosc/libH5Zblosc.so: diff --git a/src/bzip2/Makefile b/src/bzip2/Makefile index 449bbe7..154354e 100644 --- a/src/bzip2/Makefile |