[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/66: gnu: hurd: Support native build on the Hurd.
From: |
guix-commits |
Subject: |
55/66: gnu: hurd: Support native build on the Hurd. |
Date: |
Fri, 14 Jul 2023 17:56:45 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 344cc73fdaaabf3ab2deee6731fcd9ef7f4cf689
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 38b5ae7f0b..2df7b22a24 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -329,7 +329,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)
@@ -468,13 +469,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)))))
@@ -485,12 +488,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"))
- 32/66: gnu: e2fsprogs: Skip failing tests on the Hurd., (continued)
- 32/66: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 35/66: gnu: cairo: Support building for the Hurd., guix-commits, 2023/07/14
- 36/66: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/07/14
- 43/66: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/14
- 44/66: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/14
- 46/66: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/14
- 47/66: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/14
- 49/66: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/14
- 48/66: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/14
- 50/66: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/07/14
- 55/66: gnu: hurd: Support native build on the Hurd.,
guix-commits <=
- 60/66: gnu: guix: Update to 1.4.0-8.51376bc6f6., guix-commits, 2023/07/14
- 63/66: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/14
- 66/66: locale: Set %default-locale-definitions to glibc/hurd on the Hurd., guix-commits, 2023/07/14
- 65/66: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/14
- 23/66: gnu: libbsd: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 24/66: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 33/66: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/14
- 34/66: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/14
- 19/66: gnu: openssl: Build fix for the Hurd., guix-commits, 2023/07/14
- 20/66: gnu: python: Support native build on the Hurd., guix-commits, 2023/07/14