guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: mash: Use C++ 14.


From: guix-commits
Subject: 01/02: gnu: mash: Use C++ 14.
Date: Wed, 5 Dec 2018 15:30:06 -0500 (EST)

cbaines pushed a commit to branch master
in repository guix.

commit 9718265eecf8e463405954886be71c4dbd52358a
Author: Christopher Baines <address@hidden>
Date:   Wed Nov 7 19:39:29 2018 +0000

    gnu: mash: Use C++ 14.
    
    I'm looking to upgrade capnproto, and mash fails to build with 0.7. 
Therefore,
    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)[arguments]: Add new use-c++14 
phase.
---
 gnu/packages/bioinformatics.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 7c0429a..e17c536 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4024,6 +4024,14 @@ sequences).")
                             "src/mash/CommandScreen.cpp")
                (("^#include \"kseq\\.h\"")
                 "#include \"htslib/kseq.h\""))
+             #t))
+         (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)))))
     (native-inputs
      `(("autoconf" ,autoconf)



reply via email to

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