branch master updated: gnu: r-rhdf5lib: Fix libsz substitution.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

niedzejkob pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 56f12a6  gnu: r-rhdf5lib: Fix libsz substitution.
56f12a6 is described below

commit 56f12a65a0829bd6d8e8f6c4d04102e5273bd09e
Author: Jakub Kądziołka <kuba@kadziolka.net>
AuthorDate: Sun Jul 19 15:46:13 2020 +0200

    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.
---
 gnu/packages/bioinformatics.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 8a6be59..681919d 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))