From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRMBx-00083w-AG for guix-patches@gnu.org; Mon, 26 Nov 2018 14:05:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRMBr-0008RA-FQ for guix-patches@gnu.org; Mon, 26 Nov 2018 14:05:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:45858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRMBr-0008R0-CB for guix-patches@gnu.org; Mon, 26 Nov 2018 14:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gRMBq-0007Jt-TN for guix-patches@gnu.org; Mon, 26 Nov 2018 14:05:02 -0500 Subject: [bug#33308] [PATCH v2 1/2] gnu: mash: Fix build with capnproto 0.7. Resent-Message-ID: From: Christopher Baines Date: Mon, 26 Nov 2018 19:04:32 +0000 Message-Id: <20181126190433.25295-1-mail@cbaines.net> In-Reply-To: <87va58hdt1.fsf@cbaines.net> References: <87va58hdt1.fsf@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, 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 782af294e0..571d85aed7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4018,6 +4018,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) -- 2.19.2