From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKavP-0000mm-CB for guix-patches@gnu.org; Wed, 07 Nov 2018 22:24:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKavK-0001hW-JU for guix-patches@gnu.org; Wed, 07 Nov 2018 22:24:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKavK-0001hD-Dt for guix-patches@gnu.org; Wed, 07 Nov 2018 22:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gKavK-0000sZ-5B for guix-patches@gnu.org; Wed, 07 Nov 2018 22:24:02 -0500 Subject: [bug#33308] [PATCH 1/2] gnu: mash: Update to 2.1. Resent-Message-ID: Date: Wed, 7 Nov 2018 21:23:27 -0600 From: Eric Bavier Message-ID: <20181107212327.2b3f7ded@centurylink.net> In-Reply-To: <20181107195654.22832-1-mail@cbaines.net> References: <87va58hdt1.fsf@cbaines.net> <20181107195654.22832-1-mail@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/fHB_Kx3TRC8JZa+shNXEflK"; protocol="application/pgp-signature" 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: Christopher Baines Cc: 33308@debbugs.gnu.org --Sig_/fHB_Kx3TRC8JZa+shNXEflK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Wed, 7 Nov 2018 19:56:53 +0000 Christopher Baines wrote: > * gnu/packages/bioinformatics.scm (mash)[version]: Change to 2.1. > [source]: Update sha256 hash. I think here we typically just say "(mash)[source]: Upgrade to 2.1." > [arguments]: Add new use-c++14 phase, to patch source to build using c++1= 4. > --- > gnu/packages/bioinformatics.scm | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) >=20 > diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatic= s.scm > index 9f0b8025da..93503d82b8 100644 > --- a/gnu/packages/bioinformatics.scm > +++ b/gnu/packages/bioinformatics.scm > @@ -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")) I believe the configure.ac patch is sufficient for us here, since the compile steps will pick up the CPPFLAGS set there. Too bad the configure.ac is written so poorly... :( one should be able to just pass "CPPFLAGS=3D-std=3Dc++14" to `make`. > + #t)) > + (add-after 'use-c++14 'autoconf > (lambda _ (zero? (system* "autoconf"))))))) Maybe you could also update this step to use 'invoke'. Thanks, `~Eric --Sig_/fHB_Kx3TRC8JZa+shNXEflK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlvjrC8ACgkQ/XPKxxnT JWZ7/A/+L/z4LHaHeFfXm+Xol43VUryILpWzJ8NkCvyNLBwAk+r7ymmu26Fmgyja rMuF36x8zBJgtEDmCd/6YYc7RkzjzC2Iww2Uc8E3ukLgwDOsY2S+uLxs5qdNATsp knm80bO92Ei4JUuznjfWvyY4SCGhyfTRxdCsqk1wdlRw9srh2us0WvFtJzbh3OYI bc1mXpYd4A+1ke4fDfnpcEqGOeMXc4SPAQ0TN1Z06jeRmKLANmb5Bb2Z0Z/qoqsi H5phSxNand64SDeSqIG7TqbefggBzAg3tlqZc/nGtFOI9xU+54uEuSLoiDJkAIVc m6/h6DwBvePnBDH+jjlWf4ZtybIzVSMWlZC/Mlg/+iJg0mqYZyiv3C6FzCVaVd1n hRArWnm/TE0Q7cSSju67zKj8/6or94kA4lX+wSZyv8UhOac/0eV44h7pAO66jhlO WKaqiMBEioDHRm+yS3UV1HJE4kk4jCP38wu1qrhD2lmqsghoYICk7B4d12c8XY1H hihchygZ8+T5+To2y65zjiMiJRQ9WRcqogHSQkvNMuh6Ntuh5jjr+dp40a7OFYBu UYGbTM1lOkt2Pj9wGyaeJ2e2H7kFQ6nF1zfvyT0xop5TbQ15i8py4xVBEw1hKz2l hP749qdRkvueafBdz1ASCZX1P43PhEjmx1y8jz0AADXBmbWRcIc= =YzmY -----END PGP SIGNATURE----- --Sig_/fHB_Kx3TRC8JZa+shNXEflK--