[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch hurd-team updated: gnu: hurd: Support native build on the Hurd.
From: |
guix-commits |
Subject: |
branch hurd-team updated: gnu: hurd: Support native build on the Hurd. |
Date: |
Tue, 20 Jun 2023 12:39:18 -0400 |
This is an automated email from the git hooks/post-receive script.
janneke pushed a commit to branch hurd-team
in repository guix.
The following commit(s) were added to refs/heads/hurd-team by this push:
new 022c6c85f7 gnu: hurd: Support native build on the Hurd.
022c6c85f7 is described below
commit 022c6c85f7d1f09e1f1e7c06e0893d012aa1bb88
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Jun 20 17:09:17 2023 +0200
gnu: hurd: Support native build on the Hurd.
* gnu/packages/hurd.scm (hurd)[arguments]: In phases 'build-libdde-linux'
and
'install-goodies', also look in inputs for dependencies. There is no check
target, so set #:tests? to #false.
---
gnu/packages/hurd.scm | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 9df33a5775..7b18c85cb9 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -323,7 +323,8 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
"hurd-startup.patch"))))
(version (package-version hurd-headers))
(arguments
- `(#:phases
+ `(#:tests? #f ;no "check" target
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'prepare-addons
(lambda* (#:key native-inputs inputs #:allow-other-keys)
@@ -465,13 +466,15 @@ exec ${system}/rc \"$@\"
#t)))
(add-after 'build 'build-libdde-linux
(lambda* (#:key inputs native-inputs #:allow-other-keys)
- (invoke (string-append (assoc-ref native-inputs "make")
+ (invoke (string-append (or (assoc-ref native-inputs "make")
+ (assoc-ref inputs "make"))
"/bin/make")
;; XXX There can be a race condition because subdirs
;; aren't interdependent targets in the Makefile.
"-j1" "-C" "libdde_linux26"
(string-append "SHELL="
- (assoc-ref native-inputs "bash")
+ (or (assoc-ref native-inputs "bash")
+ (assoc-ref inputs "bash"))
"/bin/bash")
(string-append "CC="
,(cc-for-target)))))
@@ -482,12 +485,14 @@ exec ${system}/rc \"$@\"
(let* ((out (assoc-ref outputs "out"))
(datadir (string-append out "/share/hurd")))
;; Install libdde_linux26.
- (invoke (string-append (assoc-ref native-inputs "make")
+ (invoke (string-append (or (assoc-ref native-inputs "make")
+ (assoc-ref inputs "make"))
"/bin/make")
"-C" "libdde_linux26" "install"
(string-append "SHELL="
- (assoc-ref native-inputs "bash")
- "/bin/bash")
+ (or (assoc-ref native-inputs "bash")
+ (assoc-ref inputs "bash"))
+ "/bin/bash")
(string-append "INSTALLDIR="
out
"/share/libdde_linux26/build/include"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch hurd-team updated: gnu: hurd: Support native build on the Hurd.,
guix-commits <=