[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/31: gnu: hurd: Fix hurd-target?, add hurd-system?.
From: |
guix-commits |
Subject: |
03/31: gnu: hurd: Fix hurd-target?, add hurd-system?. |
Date: |
Thu, 19 Mar 2020 11:03:09 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 922995f75b8200378da9bdde26eecee829f61ac0
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Wed Mar 4 11:49:46 2020 -0500
gnu: hurd: Fix hurd-target?, add hurd-system?.
* gnu/packages/hurd.scm (hurd-target?): Bugfix; the arguments to
string-suffix? to test (%current-system) were transposed, always resulting
in #f. Use hurd-triplet?.
(hurd-system?): New exported variable.
---
gnu/packages/hurd.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c147bac..59d5c31 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2020 Marius Bakke <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,8 +35,9 @@
#:use-module (gnu packages base)
#:use-module (gnu packages texinfo)
#:use-module (guix git-download)
- #:export (hurd-triplet?
- hurd-target?))
+ #:export (hurd-system?
+ hurd-target?
+ hurd-triplet?))
(define (hurd-triplet? triplet)
(and (string-suffix? "-gnu" triplet)
@@ -45,7 +47,12 @@
"Return true if the cross-compilation target or the current system is
GNU/Hurd."
(or (and=> (%current-target-system) hurd-triplet?)
- (string-suffix? (%current-system) "-gnu")))
+ (and (not (%current-target-system))
+ (and=> (%current-system) hurd-triplet?))))
+
+(define (hurd-system?)
+ "Return true if the current system is the Hurd."
+ (and=> (%current-system) hurd-triplet?))
(define (hurd-source-url version)
(string-append "mirror://gnu/hurd/hurd-"
- branch wip-hurd created (now 152081e), guix-commits, 2020/03/19
- 03/31: gnu: hurd: Fix hurd-target?, add hurd-system?.,
guix-commits <=
- 06/31: gnu: cross-libc: Build fix for the Hurd., guix-commits, 2020/03/19
- 09/31: gnu: bootstrap: Use fall-back mechanism for bootstrap-executables., guix-commits, 2020/03/19
- 02/31: gnu: grub: Support for the Hurd., guix-commits, 2020/03/19
- 08/31: gnu: bootstrap: gcc-static: Use gcc-5., guix-commits, 2020/03/19
- 10/31: gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/19
- 13/31: gnu: commencement: gnumach-headers-boot0: Build from tarball., guix-commits, 2020/03/19
- 05/31: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/19
- 14/31: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/19
- 16/31: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/19
- 18/31: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/19