guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#33308] [PATCH 1/2] gnu: mash: Update to 2.1.


From: Christopher Baines
Subject: [bug#33308] [PATCH 1/2] gnu: mash: Update to 2.1.
Date: Wed, 7 Nov 2018 19:56:53 +0000

I'm looking to upgrade capnproto, and mash fails to build with 0.7. Therefore,
update it, and tweak the compilation to allow it to build with 0.7. The
package also builds with the current version of capnproto. I got the idea of
changing the c++ version from here [1].

1: https://github.com/marbl/Mash/issues/98

* gnu/packages/bioinformatics.scm (mash)[version]: Change to 2.1.
[source]: Update sha256 hash.
[arguments]: Add new use-c++14 phase, to patch source to build using c++14.
---
 gnu/packages/bioinformatics.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 9f0b8025da..93503d82b8 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3977,7 +3977,7 @@ sequences).")
 (define-public mash
   (package
     (name "mash")
-    (version "2.0")
+    (version "2.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3986,7 +3986,7 @@ sequences).")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "00fx14vpmgsijwxd1xql3if934l82v8ckqgjjyyhnr36qb9qrskv"))
+                "0d5m9wx1bspa5vwikazdbar4i0h6b20lzjjl1icfyl66sy1q9v9q"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -4012,7 +4012,15 @@ sequences).")
                (("^#include \"kseq\\.h\"")
                 "#include \"htslib/kseq.h\""))
              #t))
-         (add-after 'fix-includes 'autoconf
+         (add-after 'fix-includes 'use-c++14
+           (lambda _
+             ;; capnproto 0.7 requires c++14 to build
+             (substitute* "configure.ac"
+               (("c\\+\\+11") "c++14"))
+             (substitute* "Makefile.in"
+               (("c\\+\\+11") "c++14"))
+             #t))
+         (add-after 'use-c++14 'autoconf
            (lambda _ (zero? (system* "autoconf")))))))
     (native-inputs
      `(("autoconf" ,autoconf)
-- 
2.19.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]