[PATCH] gnu: %bootstrap-coreutils&co: Patch egrep/fgrep to point to the correct grep.

OpenSubmitted by manolis837.
Details
4 participants
  • Efraim Flashner
  • Jonathan Brielmaier
  • Ludovic Courtès
  • manolis837
Owner
unassigned
Severity
normal
Merged with
M
M
manolis837 wrote on 23 Feb 2017 12:41
(address . guix-patches@gnu.org)(address . efraim@flashner.co.il)
20170223114119.18004-1-manolis837@gmail.com
Hello everyone,
Commit 653add37af10b0d5dbc20c8bc7ce30eec8cf4ae7 patches egrep/fgrep to point to the location of grep. But the problem is that when it was run on Hurd, the path for grep in egrep/fgrep had this form: /gnu/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-grep-2.25/bin/grep
The above was not being substituted and caused the build to fail. So I changed the pattern to "/[^ ]+/bin/grep" and now the path is always replaced.
Also (getcwd) returns the current path which the build takes place. This happens to be /tmp/guix-build-..-bootstrap-binaries-0.This is wrong because it should point to the final place in /gnu/store. That why I am using "out".
Thank you,Manolis
E
E
Efraim Flashner wrote on 25 Feb 2017 19:58
C634411A-54AB-496B-97CC-4C7D7FFF2BE2@flashner.co.il
On February 23, 2017 1:41:18 PM GMT+02:00, manolis837@gmail.com wrote:
Toggle quote (14 lines)>>Hello everyone, >>Commit 653add37af10b0d5dbc20c8bc7ce30eec8cf4ae7 patches egrep/fgrep to>point to the location of grep. >But the problem is that when it was run on Hurd, the path for grep in>egrep/fgrep had this form: >/gnu/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-grep-2.25/bin/grep>>The above was not being substituted and caused the build to fail. So I>changed the pattern to >"/[^ ]+/bin/grep" and now the path is always replaced. >
I also pushed a patch that patched the generated [e|f]grep to not have the path inserted into it, so the aarch64 bootstrap binaries have:#!/bin/shexec grep -F...I think we're going to have to find a way that works for both architectures. I tried using (%current-target) but I couldn't get it to work inside the snippet.
Toggle quote (5 lines)>Also (getcwd) returns the current path which the build takes place.>This happens to be /tmp/guix-build-..-bootstrap-binaries-0.>This is wrong because it should point to the final place in /gnu/store.>That why I am using "out".
While that is probably better, in the end it doesn't really matter I believe, when I ran 'find /gnu -name fgrep -execdir cat {} +' it showed both bash and grep pointing to the bootstrap binaries.
Toggle quote (3 lines)>Thank you,>Manolis
-- Sent from my Android device with K-9 Mail. Please excuse my brevity.
L
L
Ludovic Courtès wrote on 26 Mar 2017 15:53
control message for bug #25849
(address . control@debbugs.gnu.org)
87tw6gp2kf.fsf@gnu.org
merge 25849 25848
J
J
Jonathan Brielmaier wrote on 16 Nov 2020 18:59
[PATCH] gnu: %bootstrap-coreutils
(address . 25848@debbugs.gnu.org)
62265294-3ea4-f72b-439d-0a207e5674da@web.de
@Manolis: Does this problem still exist with all the new Hurd work fromJanneke and Co?
?