From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH 1/2] gnu: libtool: Use 'modify-phases'. Date: Thu, 05 Jan 2017 10:55:05 +0000 Message-ID: <87tw9drd2u.fsf@wasp.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> <87fukxvlmg.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cP5gu-0001sa-Jk for guix-devel@gnu.org; Thu, 05 Jan 2017 05:54:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cP5gt-0002Lz-Fa for guix-devel@gnu.org; Thu, 05 Jan 2017 05:54:40 -0500 In-Reply-To: <87fukxvlmg.fsf@gnu.org> 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: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org Ludovic Courtès writes: > Leo Famulari skribis: > >> 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 > > [...] > >> + (modify-phases %standard-phases >> + (add-before 'check 'pre-check >> + (lambda* (#:key inputs #:allow-other-keys) > > Could you align “(” below the ‘d’ of ‘add-before’? Sorry. I wonder what happened here, this happens with all new files I have. Seems like at some point the emacs version I have started ignoring the .emacs.d/scheme-indent-function.el I have... >> From fc60e04d85ab171538333fe5aa47c2e6849b02e3 Mon Sep 17 00:00:00 2001 >> From: ng0 >> Date: Sun, 1 Jan 2017 15:24:28 +0000 >> Subject: [PATCH 2/3] gnu: libtool: Restore ltmain.sh shebang. >> >> This fixes >> >> * gnu/packages/autotools.scm (libtool)[arguments]: Add new phase >> 'restore-ltmain-shebang'. >> [native-inputs]: Add help2man. >> >> Signed-off-by: Leo Famulari > > [...] > >> + (add-after 'patch-source-shebangs 'restore-ltmain-shebang >> + (lambda* (#:key inputs #:allow-other-keys) > > Likewise. > >> + (substitute* "build-aux/ltmain.in" >> + (((string-append (assoc-ref inputs "bash") "/bin/sh")) >> + "/bin/sh"))))))) > > We should use literal strings for patterns, like: > > (substitute* … > (("^#!.*/bin/sh$") …)) > >> From 809120b991603b8c557be7481be2bbae29bd8a7f Mon Sep 17 00:00:00 2001 >> From: Leo Famulari >> Date: Wed, 4 Jan 2017 19:44:27 -0500 >> Subject: [PATCH 3/3] gnu: libtool: Don't replace 'sh' reference with 'bash'. >> >> Bash behaves differently based on how it is invoked (see Invocation in bash(1)). >> >> * gnu/packages/autotools.scm (libtool)[arguments]: Use /bin/sh instead >> of /bin/bash in 'pre-check' phase. Fix typo in comment. > > Makes sense. > > Could you push them to ‘core-updates’? > > Thank you Leo & ng0! > > Ludo’. > -- ♥Ⓐ ng0 PGP keys and more: https://n0is.noblogs.org/ http://ng0.chaosnet.org