Ludovic Courtès <l...@gnu.org> writes: > Leo Famulari <l...@famulari.name> 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 <n...@libertad.pw> >> 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 <l...@famulari.name> > > [...] > >> + (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 <n...@libertad.pw> >> Date: Sun, 1 Jan 2017 15:24:28 +0000 >> Subject: [PATCH 2/3] gnu: libtool: Restore ltmain.sh shebang. >> >> This fixes <http://bugs.gnu.org/25304> >> >> * gnu/packages/autotools.scm (libtool)[arguments]: Add new phase >> 'restore-ltmain-shebang'. >> [native-inputs]: Add help2man. >> >> Signed-off-by: Leo Famulari <l...@famulari.name> > > [...] > >> + (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 <l...@famulari.name> >> 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