[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/65: gnu: hurd: Support native build on the Hurd.
From: |
guix-commits |
Subject: |
54/65: gnu: hurd: Support native build on the Hurd. |
Date: |
Fri, 14 Jul 2023 10:06:07 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 313cfd409f154490cbbfd46be67cc4492a90ce1e
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 3c88438cdd..523f8eef8a 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -333,7 +333,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)
@@ -472,13 +473,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)))))
@@ -489,12 +492,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"))
- 55/65: build: Build gnu/packages/*.go in five steps., (continued)
- 55/65: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/14
- 60/65: gnu: guix: Update to 1.4.0-9.5165f041af., guix-commits, 2023/07/14
- 64/65: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/14
- 21/65: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 30/65: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/14
- 38/65: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 41/65: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/14
- 44/65: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/14
- 45/65: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/14
- 43/65: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/14
- 54/65: gnu: hurd: Support native build on the Hurd.,
guix-commits <=
- 47/65: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/14
- 56/65: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/07/14
- 29/65: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/07/14
- 32/65: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/14
- 58/65: gnu: guix: Disable some tests on the Hurd., guix-commits, 2023/07/14
- 59/65: gnu: guix: Update to 1.4.0-8.7f38c79689., guix-commits, 2023/07/14
- 62/65: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/14
- 61/65: DRAFT hurd: Support second boot., guix-commits, 2023/07/14
- 13/65: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/14
- 31/65: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/14