[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
83/92: gnu: hurd: Support native build on the Hurd.
From: |
guix-commits |
Subject: |
83/92: gnu: hurd: Support native build on the Hurd. |
Date: |
Fri, 23 Jun 2023 12:45:47 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit d0ba901fd6e2f9e492ac78e507018227e990d748
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 322a12ae20..b777fe6a95 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -322,7 +322,8 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
"hurd-rumpdisk-no-hd.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)
@@ -461,13 +462,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)))))
@@ -478,12 +481,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"))
- 64/92: gnu: openssl-1.1: Fix shared build for the Hurd., (continued)
- 64/92: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/23
- 69/92: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/23
- 71/92: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/23
- 70/92: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/06/23
- 73/92: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/06/23
- 78/92: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/06/23
- 79/92: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 80/92: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 81/92: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/23
- 82/92: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/23
- 83/92: gnu: hurd: Support native build on the Hurd.,
guix-commits <=
- 84/92: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/06/23
- 85/92: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/06/23
- 86/92: gnu: guix: Disable some test on 32bit., guix-commits, 2023/06/23
- 89/92: gnu: guix: Update to 1.4.0-9.cf94c6e337., guix-commits, 2023/06/23
- 92/92: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/23
- 91/92: DRAFT hurd-boot: Support second boot., guix-commits, 2023/06/23