[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67824] [PATCH core-updates v2 6/9] gnu: glibc-utf8-locales: Add the
From: |
Ludovic Courtès |
Subject: |
[bug#67824] [PATCH core-updates v2 6/9] gnu: glibc-utf8-locales: Add the C.UTF-8 locale. |
Date: |
Mon, 18 Dec 2023 17:30:17 +0100 |
* gnu/packages/base.scm (%default-utf8-locales): Add "C".
(make-glibc-utf8-locales): Delete "C" from LOCALES for glibc versions
lower than or equal to 2.35.
Change-Id: I6a6faa68dc18bf0f87c372109a17f476d3561278
---
gnu/packages/base.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index d31c0b0772..eab9ff411d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1396,7 +1396,8 @@ (define-public (make-glibc-locales glibc)
(define %default-utf8-locales
;; These are the locales commonly used for tests---e.g., in Guile's i18n
;; tests.
- '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
+ '("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
+
(define*-public (make-glibc-utf8-locales glibc #:key
(locales %default-utf8-locales)
(name "glibc-utf8-locales"))
@@ -1444,7 +1445,14 @@ (define*-public (make-glibc-utf8-locales glibc #:key
(symlink (string-append locale ".utf8")
(string-append localedir "/"
locale ".UTF-8")))
- '#$locales)))))
+
+ ;; The C.UTF-8 locale was introduced in 2.35 but it
+ ;; fails to build there:
+ ;;
<https://sourceware.org/bugzilla/show_bug.cgi?id=28861>.
+ '#$(if (version>? (package-version this-package)
+ "2.35")
+ locales
+ (delete "C" locales)))))))
(native-inputs (list glibc gzip))
(synopsis (if default-locales?
(P_ "Small sample of UTF-8 locales")
--
2.41.0
- [bug#67824] [PATCH core-updates 1/6] packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’., (continued)
- [bug#67824] [PATCH core-updates 1/6] packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 0/6] Run builds in C.UTF-8 locale, Janneke Nieuwenhuizen, 2023/12/16
- [bug#67824] [PATCH core-updates v2 0/9] Run builds in C.UTF-8 locale, Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 2/9] build-system/gnu: Change default locale to C.UTF-8., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 1/9] packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 3/9] gnu: commencement: Remove ‘glibc-utf8-locales’ from ‘%final-inputs’., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 5/9] packages: Output and error ports are line-buffered in ‘patch-and-repack’., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 4/9] profiles: Use C.UTF-8 instead of ‘glibc-utf8-locales’ where possible., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 6/9] gnu: glibc-utf8-locales: Add the C.UTF-8 locale.,
Ludovic Courtès <=
- [bug#67824] [PATCH core-updates v2 9/9] gnu: glib: Skip test that fails with glibc 2.38., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 8/9] build-system/gnu: Turn PID 1 into an “init”-style process by default., Ludovic Courtès, 2023/12/18
- [bug#67824] [PATCH core-updates v2 7/9] gnu: glibc: Add patch for ‘ucontext’ on x86_64-gnu (GNU/Hurd)., Ludovic Courtès, 2023/12/18
- bug#67824: [PATCH core-updates v2 0/9] Run builds in C.UTF-8 locale, Ludovic Courtès, 2023/12/19