From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH 1/2] gnu: libtool: Use 'modify-phases'. Date: Thu, 05 Jan 2017 14:50:05 +0100 Message-ID: <87r34hy5te.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170101144525.10710-1-ng0@libertad.pw> <20170101152428.27552-1-ng0@libertad.pw> <20170105010939.GA30755@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cP8Ql-0007EO-CN for guix-devel@gnu.org; Thu, 05 Jan 2017 08:50:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cP8Qi-0000OM-6H for guix-devel@gnu.org; Thu, 05 Jan 2017 08:50:11 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:59946) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cP8Qi-0000Mz-09 for guix-devel@gnu.org; Thu, 05 Jan 2017 08:50:08 -0500 In-Reply-To: <20170105010939.GA30755@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari , ng0 Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Sun, Jan 01, 2017 at 03:24:27PM +0000, ng0 wrote: >> * gnu/packages/autotools.scm (libtool): Use 'modify-phases'. >> [arguments]: Use 'modify-phases'. > >> + ("help2man" ,help2man) ;because we modify ltmain.sh > > This should go in the other patch, right? > > I attached a revised patch series with that change, and another bug fix. > From 7f0fce3f71be7da461de89fb5f6f47289c6498b6 Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Sun, 1 Jan 2017 15:24:27 +0000 > Subject: [PATCH 1/3] gnu: libtool: Use 'modify-phases'. > > * gnu/packages/autotools.scm (libtool): Use 'modify-phases'. > [arguments]: Use 'modify-phases'. > > Signed-off-by: Leo Famulari > --- > gnu/packages/autotools.scm | 30 ++++++++++++++++-------------- > 1 file changed, 16 insertions(+), 14 deletions(-) > > diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm > index 72492e70e..64a1e68bf 100644 > --- a/gnu/packages/autotools.scm > +++ b/gnu/packages/autotools.scm > @@ -5,6 +5,7 @@ > ;;; Copyright =C2=A9 2014 Manolis Fragkiskos Ragkousis > ;;; Copyright =C2=A9 2015 Mark H Weaver > ;;; Copyright =C2=A9 2016 David Thompson > +;;; Copyright =C2=A9 2017 ng0 > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -313,21 +314,22 @@ Makefile, simplifying the entire process for the de= veloper.") > (or (%current-target-system) > (%current-system)))) >=20=20 > - #:phases (alist-cons-before > - 'check 'pre-check > - (lambda* (#:key inputs #:allow-other-keys) > - ;; Run the test suite in parallel, if possible. > - (setenv "TESTSUITEFLAGS" > - (string-append > - "-j" > - (number->string (parallel-job-count)))) > + #:phases > + (modify-phases %standard-phases > + (add-before 'check 'pre-check > + (lambda* (#:key inputs #:allow-other-keys) > + ;; Run the test suite in parallel, if possible. > + (setenv "TESTSUITEFLAGS" > + (string-append > + "-j" > + (number->string (parallel-job-count)))) > + > + ;; Path references to /bin/sh. > + (let ((bash (assoc-ref inputs "bash"))) > + (substitute* "tests/testsuite" > + (("/bin/sh") > + (string-append bash "/bin/bash"))))))))) There was a discussion about making "substitute*" return #t if one or more substitutions were done, is that implemented yet? If not, please make sure phases end on a truthy value :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlhuTw0ACgkQoqBt8qM6 VPp8xQf+KGoqYT/SHc/kbDkwtPjJM3qi48tVugmmEaTEWrX2qLzbwhUIjHZ9fBn2 JXNuCXDNcf18r43sadhQmpcAYSCH6vvnJgvqi84rb3IabLhgPTrheFkFe95wY0bP TsHPwqMa/WFfZGlzi3Wx2f8TCDMq102mZqyBmOjQV3R0ixx3BShZ267ZEFfdGKFg Y+G2Q95xarebiD0PPkwW/MVdvl020tguBxd4OJ5unyowhzbTYTd4zrOjFIIcBWdo 8Em1YwAr8yA+IZxxNY1bGDgWeEOD144HToWO0XZa5g812DB6CwHnPntieAky4sKy cFrUIT2OsfDcmOwIJePL43YwfKDgEQ== =DfHc -----END PGP SIGNATURE----- --=-=-=--