From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKTx0-0002q5-0k for guix-patches@gnu.org; Wed, 07 Nov 2018 14:57:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKTwm-0002pe-SU for guix-patches@gnu.org; Wed, 07 Nov 2018 14:57:12 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKTwk-0002om-DU for guix-patches@gnu.org; Wed, 07 Nov 2018 14:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gKTwk-0002cn-By for guix-patches@gnu.org; Wed, 07 Nov 2018 14:57:02 -0500 Subject: [bug#33308] [PATCH 1/2] gnu: mash: Update to 2.1. References: <87va58hdt1.fsf@cbaines.net> In-Reply-To: <87va58hdt1.fsf@cbaines.net> Resent-Message-ID: From: Christopher Baines Date: Wed, 7 Nov 2018 19:56:53 +0000 Message-Id: <20181107195654.22832-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33308@debbugs.gnu.org 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