From patchwork Mon Nov 26 19:04:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 320 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0CB3016826; Mon, 26 Nov 2018 19:05:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 0B40A1681B for ; Mon, 26 Nov 2018 19:05:19 +0000 (GMT) Received: from localhost ([::1]:38264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRMC6-00086s-1D for patchwork@mira.cbaines.net; Mon, 26 Nov 2018 14:05:18 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33308] [PATCH v2 1/2] gnu: mash: Fix build with capnproto 0.7. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Nov 2018 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33308 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33308@debbugs.gnu.org Received: via spool by 33308-submit@debbugs.gnu.org id=B33308.154325908528104 (code B ref 33308); Mon, 26 Nov 2018 19:05:02 +0000 Received: (at 33308) by debbugs.gnu.org; 26 Nov 2018 19:04:45 +0000 Received: from localhost ([127.0.0.1]:50115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRMBZ-0007JE-C4 for submit@debbugs.gnu.org; Mon, 26 Nov 2018 14:04:45 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:49710 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRMBS-0007J0-6I for 33308@debbugs.gnu.org; Mon, 26 Nov 2018 14:04:38 -0500 Received: by mira.cbaines.net (Postfix, from userid 113) id C0E2016826; Mon, 26 Nov 2018 19:04:37 +0000 (GMT) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id CCC341681B for <33308@debbugs.gnu.org>; Mon, 26 Nov 2018 19:04:33 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f5f5fe92 for <33308@debbugs.gnu.org>; Mon, 26 Nov 2018 19:04:33 +0000 (UTC) From: Christopher Baines Date: Mon, 26 Nov 2018 19:04:32 +0000 Message-Id: <20181126190433.25295-1-mail@cbaines.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <87va58hdt1.fsf@cbaines.net> References: <87va58hdt1.fsf@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)