unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 33308@debbugs.gnu.org
Subject: [bug#33308] [PATCH 1/2] gnu: mash: Update to 2.1.
Date: Wed,  7 Nov 2018 19:56:53 +0000	[thread overview]
Message-ID: <20181107195654.22832-1-mail@cbaines.net> (raw)
In-Reply-To: <87va58hdt1.fsf@cbaines.net>

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	other threads:[~2018-11-07 19:57 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-07 19:45 [bug#33308] [PATCH 0/2] Update mosh and capnproto Christopher Baines
2018-11-07 19:56 ` Christopher Baines [this message]
2018-11-07 19:56   ` [bug#33308] [PATCH 2/2] gnu: capnproto: Update to 0.7.0 Christopher Baines
2018-11-10 22:22     ` Ludovic Courtès
2018-11-26 19:27       ` Christopher Baines
2018-11-08  3:23   ` [bug#33308] [PATCH 1/2] gnu: mash: Update to 2.1 Eric Bavier
2018-11-26 19:35     ` Christopher Baines
2018-11-07 20:19 ` [bug#33308] [PATCH 0/2] Update mosh and capnproto Leo Famulari
2018-11-26 19:25   ` Christopher Baines
2018-11-26 19:04 ` [bug#33308] [PATCH v2 1/2] gnu: mash: Fix build with capnproto 0.7 Christopher Baines
2018-11-26 19:04   ` [bug#33308] [PATCH v2 2/2] gnu: capnproto: Update to 0.7.0 Christopher Baines
2018-12-05 20:34     ` bug#33308: " Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181107195654.22832-1-mail@cbaines.net \
    --to=mail@cbaines.net \
    --cc=33308@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).