[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
66/66: locale: Set %default-locale-definitions to glibc/hurd on the Hurd
From: |
guix-commits |
Subject: |
66/66: locale: Set %default-locale-definitions to glibc/hurd on the Hurd. |
Date: |
Fri, 14 Jul 2023 17:56:46 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 2bb5a6de1da1341949890437dbde70064fcc0116
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
- 43/66: gnu: doxygen: Fix build for the Hurd., (continued)
- 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, 2023/07/14
- 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 <=
- 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
- 22/66: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 25/66: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 26/66: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/14