me/guix
Archived
1
0
Fork 0
Code Activity

gnu: r-rhdf5lib: Fix libsz substitution.

Browse source 
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:
Jakub Kądziołka 2020-07-19 15:46:13 +02:00
parent cd6aa38e7f
commit 56f12a65a0
No known key found for this signature in database
GPG key ID: E315A75846131564
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/bioinformatics.scm
View file

@ -10867,14 +10867,7 @@ block processing.")
(for-each delete-file '("configure" "configure.ac")) (for-each delete-file '("configure" "configure.ac"))
;; Do not make other packages link with the proprietary libsz. ;; Do not make other packages link with the proprietary libsz.
(substitute* "R/zzz.R" (substitute* "R/zzz.R"
(("'\"%s/libhdf5.a\" \"%s/libsz.a\" -lz'") ((" \"%s/libsz.a\"") ""))
"'\"%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'"))
(with-directory-excursion "src" (with-directory-excursion "src"
(invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source"))
(rename-file (string-append "hdf5-" ,(package-version hdf5-1.10)) (rename-file (string-append "hdf5-" ,(package-version hdf5-1.10))