mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 14:56:54 +01:00
gnu: r-rhdf5lib: Adjust modifications to Makevars.
* gnu/packages/bioconductor.scm (r-rhdf5lib)[arguments]: Adjust patch. Change-Id: Iaef3d2d80c22de1c2a0b64e7c13f5fa3b8e5719d
This commit is contained in:
parent
c82c9c8090
commit
a938342899
1 changed files with 3 additions and 2 deletions
|
@ -20569,8 +20569,6 @@ (define-public r-rhdf5lib
|
||||||
(substitute* "Makevars"
|
(substitute* "Makevars"
|
||||||
(("@BUILD_HDF5@") "")
|
(("@BUILD_HDF5@") "")
|
||||||
(("@COPY_SZIP@") "")
|
(("@COPY_SZIP@") "")
|
||||||
(("@ZLIB_LIB@") "-lz")
|
|
||||||
(("@ZLIB_INCLUDE@") "")
|
|
||||||
(("HDF5_CXX_LIB=.*")
|
(("HDF5_CXX_LIB=.*")
|
||||||
(string-append "HDF5_CXX_LIB="
|
(string-append "HDF5_CXX_LIB="
|
||||||
(assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n"))
|
(assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n"))
|
||||||
|
@ -20587,6 +20585,9 @@ (define-public r-rhdf5lib
|
||||||
(("HDF5_HL_CXX_LIB=.*")
|
(("HDF5_HL_CXX_LIB=.*")
|
||||||
(string-append "HDF5_HL_CXX_LIB="
|
(string-append "HDF5_HL_CXX_LIB="
|
||||||
(assoc-ref inputs "hdf5") "/lib/libhdf5_hl_cpp.a\n"))
|
(assoc-ref inputs "hdf5") "/lib/libhdf5_hl_cpp.a\n"))
|
||||||
|
(("@ZLIB_LIB_PATH@") "-lz")
|
||||||
|
(("@ZLIB_INCLUDE_PATH@") "")
|
||||||
|
|
||||||
;; szip is non-free software
|
;; szip is non-free software
|
||||||
(("cp \"\\$\\{SZIP_LIB\\}.*") "")
|
(("cp \"\\$\\{SZIP_LIB\\}.*") "")
|
||||||
(("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n"))))))))
|
(("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n"))))))))
|
||||||
|
|
Loading…
Reference in a new issue