diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-19 15:46:13 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-19 15:54:48 +0200 |
| commit | 56f12a65a0829bd6d8e8f6c4d04102e5273bd09e (patch) | |
| tree | 827ec74844dbf8d1a70252f6abd81a7c6245fa18 | |
| parent | cd6aa38e7fc3e7d9fa1b79db041e8bf7cda39322 (diff) | |
| download | guix-56f12a65a0829bd6d8e8f6c4d04102e5273bd09e.tar.gz | |
gnu: r-rhdf5lib: Fix libsz substitution.
This is a follow-up to commit b7f051db14fb485fcfa4917924eef186fb1b8c07 - 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.
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8a6be59d2a..681919df3d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10867,14 +10867,7 @@ block processing.") (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)) |