[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
58/58: locale: Set %default-locale-definitions to glibc/hurd on the Hurd
From: |
guix-commits |
Subject: |
58/58: locale: Set %default-locale-definitions to glibc/hurd on the Hurd. |
Date: |
Wed, 19 Jul 2023 03:00:53 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit cafc3b8db86f4296f2a1c73d91cc9ed82d21b08c
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Jun 24 15:17:42 2023 +0200
locale: Set %default-locale-definitions to glibc/hurd on the Hurd.
* gnu/system/locale.scm (%default-locale-libcs): Use only glib/hurd when
building on the Hurd.
---
gnu/system/locale.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index 6895b209dc..bc572baeb9 100644
--- a/gnu/system/locale.scm
+++ b/gnu/system/locale.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014-2017, 2019-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <jannek@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -147,7 +148,9 @@ data format changes between libc versions."
(define %default-locale-libcs
;; The libcs for which we build locales by default.
- (list glibc-2.33 glibc))
+ (if (system-hurd?)
+ (list glibc/hurd)
+ (list glibc-2.33 glibc)))
(define %default-locale-definitions
;; Arbitrary set of locales that are built by default. They are here mostly
- 44/58: gnu: guix: Disable some test on 32bit., (continued)
- 44/58: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/19
- 39/58: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/19
- 50/58: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/19
- 47/58: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/19
- 46/58: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/07/19
- 06/58: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/07/19
- 41/58: gnu: cairo: Support building for the Hurd., guix-commits, 2023/07/19
- 04/58: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/07/19
- 35/58: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/19
- 42/58: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/19
- 58/58: locale: Set %default-locale-definitions to glibc/hurd on the Hurd.,
guix-commits <=
- 26/58: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/19
- 29/58: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/19
- 33/58: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/19
- 49/58: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/07/19
- 45/58: gnu: guix: Disable some tests on the Hurd., guix-commits, 2023/07/19
- 53/58: gnu: guix: Update to 1.4.0-9.2a8bf3da1e., guix-commits, 2023/07/19
- 38/58: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/07/19
- 51/58: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/07/19
- 57/58: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/19
- 54/58: DRAFT hurd: Support second boot., guix-commits, 2023/07/19