[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: git: Fix for cross-compiling to the Hurd.
From: |
guix-commits |
Subject: |
02/02: gnu: git: Fix for cross-compiling to the Hurd. |
Date: |
Fri, 17 Apr 2020 06:45:02 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 89b71f876298fc692812a9fb9de70884b32e9757
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri Apr 17 12:32:44 2020 +0200
gnu: git: Fix for cross-compiling to the Hurd.
* gnu/packages/version-control.scm (git)[arguments]: When cross-compiling,
fix
`config.mak.uname' kludge to use the host system configuration.
---
gnu/packages/version-control.scm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index dae118b..f7f70af 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -249,12 +249,21 @@ as well as the classic centralized workflow.")
#:modules ((srfi srfi-1)
(srfi srfi-26)
+ (ice-9 match)
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
- ;; We do not have bash-for-tests when cross-compiling.
,@(if (%current-target-system)
- '()
+ ;; The git build system assumes build == host
+ `((add-after 'unpack 'use-host-uname_S
+ (lambda _
+ (substitute* "config.mak.uname"
+ (("uname_S := .*" all)
+ (match ,(%current-target-system)
+ ("i586-pc-gnu" "uname_S := GNU\n")
+ (_ all))))
+ #t)))
+ ;; We do not have bash-for-tests when cross-compiling.
`((add-after 'unpack 'modify-PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((path (string-split (getenv "PATH") #\:))