From: ludo@gnu.org (Ludovic Courtès)
To: Marius Bakke <mbakke@fastmail.com>
Cc: 31952@debbugs.gnu.org
Subject: [bug#31952] [PATCH] gnu: git: Update to 2.18.0.
Date: Sun, 24 Jun 2018 22:01:20 +0200 [thread overview]
Message-ID: <87efgwuf73.fsf@gnu.org> (raw)
In-Reply-To: <876029f4wv.fsf@fastmail.com> (Marius Bakke's message of "Sun, 24 Jun 2018 01:40:16 +0200")
Hello,
Marius Bakke <mbakke@fastmail.com> skribis:
> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Hi Marius!
>>
>> Marius Bakke <mbakke@fastmail.com> skribis:
>>
>>> * gnu/packages/version-control.scm (git): Update to 2.18.0.
>>> [native-inputs]: Add BASH.
>>> [arguments]: In #:make-flags, define SHELL_PATH and TEST_SHELL_PATH.
>>> Add #:disallowed-references. Drop /bin/sh substitution from Makefile. Add
>>> phase to prevent BASH from ending up in PATH. Delete 'patch-shebangs' phase.
>>
>> [...]
>>
>>> + ;; FIXME: This phase picks up the wrong bash when patching shebangs.
>>> + (delete 'patch-shebangs)
>>
>> Do the installed scripts still have the right shebang in spite of this?
>
> I haven't yet compared the results with and without this phase, but
> "normal" usage (including "send-email") works at least.
OK. I suppose you can simply grep for “^#!” and make sure there’s
nothing suspicious like /usr/bin/something.
>> Removing this phase altogether sounds a bit risky. Another option would
>> have been to replace it with one that moves the “right” Bash to the
>> front of PATH and then calls the original ‘patch-shebangs’ phase.
>
> The problem is that 'patch-shebangs' does not use PATH, but instead
> iterates over inputs directly. It's supposed to prefer 'inputs' to
> 'native-inputs' (according to a comment), yet in this case it picks the
> native "full" bash rather than bash-minimal.
OK.
> If you read closely, you'll notice that 'bash-for-tests' is not in PATH
> at all. 'patch-source-shebangs' and other things that use (which "sh")
> works okay due to that.
It may be that moving “bash-for-tests” to ‘inputs’ actually solves the
problem (and we don’t have to worry about cross-compilation since “make
check” does nothing when cross-compiling) and we can keep the
‘patch-shebangs’ phase.
But yeah, if this patch works, we can go for it.
Thank you!
Ludo’.
next prev parent reply other threads:[~2018-06-24 20:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-23 19:45 [bug#31952] [PATCH] gnu: git: Update to 2.18.0 Marius Bakke
2018-06-23 21:59 ` Ludovic Courtès
2018-06-23 23:40 ` Marius Bakke
2018-06-24 20:01 ` Ludovic Courtès [this message]
2018-06-24 20:38 ` bug#31952: " Marius Bakke
2018-06-25 8:54 ` [bug#31952] " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87efgwuf73.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=31952@debbugs.gnu.org \
--cc=mbakke@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).