mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-19 14:07:01 +01:00
gnu: r-rhdf5lib: Fix libsz substitution.
This is a follow-up to commit b7f051db14
-
in the new version, some of the format strings being replaced gained
quotes. This commit fixes build of dependents of r-rhdf5lib, such as
r-hdf5array.
* gnu/packages/bioinformatics (r-rhdf5lib): Remove all instances of libsz.a.
This commit is contained in:
parent
cd6aa38e7f
commit
56f12a65a0
1 changed files with 1 additions and 8 deletions
|
@ -10867,14 +10867,7 @@ (define-public r-rhdf5lib
|
|||
(for-each delete-file '("configure" "configure.ac"))
|
||||
;; Do not make other packages link with the proprietary libsz.
|
||||
(substitute* "R/zzz.R"
|
||||
(("'\"%s/libhdf5.a\" \"%s/libsz.a\" -lz'")
|
||||
"'\"%s/libhdf5.a\" \"%s/libhdf5.a\" -lz'")
|
||||
(("'\"%s/libhdf5_cpp.a\" \"%s/libhdf5.a\" \"%s/libsz.a\" -lz'")
|
||||
"'\"%s/libhdf5_cpp.a\" \"%s/libhdf5.a\" \"%s/libhdf5.a\" -lz'")
|
||||
(("'%s/libhdf5_hl.a %s/libhdf5.a %s/libsz.a -lz'")
|
||||
"'%s/libhdf5_hl.a %s/libhdf5.a %s/libhdf5.a -lz'")
|
||||
(("'%s/libhdf5_hl_cpp.a %s/libhdf5_hl.a %s/libhdf5_cpp.a %s/libhdf5.a %s/libsz.a -lz'")
|
||||
"'%s/libhdf5_hl_cpp.a %s/libhdf5_hl.a %s/libhdf5_cpp.a %s/libhdf5.a %s/libhdf5.a -lz'"))
|
||||
((" \"%s/libsz.a\"") ""))
|
||||
(with-directory-excursion "src"
|
||||
(invoke "tar" "xvf" (assoc-ref inputs "hdf5-source"))
|
||||
(rename-file (string-append "hdf5-" ,(package-version hdf5-1.10))
|
||||
|
|
Loading…
Reference in a new issue