[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: Add libc-locales-for-target and glibc-locales/hurd.
From: |
guix-commits |
Subject: |
01/02: gnu: Add libc-locales-for-target and glibc-locales/hurd. |
Date: |
Thu, 8 Jun 2023 04:16:35 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 817086d517d3bf771bf3e54148de1de6344e11f7
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Jun 7 19:19:01 2023 +0200
gnu: Add libc-locales-for-target and glibc-locales/hurd.
* gnu/packages/base.scm (glibc-locales/hurd): New variable
(libc-locales-for-target): Use it in new procedure.
(glibc-utf8-locales/hurd): New variable.
(libc-utf8-locales-for-target): Use it in new procedure.
---
gnu/packages/base.scm | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index b05b3cbeba..9435161969 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -76,6 +76,8 @@
#:use-module (srfi srfi-26)
#:export (glibc
libc-for-target
+ libc-locales-for-target
+ libc-utf8-locales-for-target
make-ld-wrapper
libiconv-if-needed))
@@ -1467,10 +1469,10 @@ command.")
(native-inputs
(modify-inputs (package-native-inputs glibc/hurd)
(prepend (if (%current-target-system)
- (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
- (cross-mig (module-ref cross-base 'cross-mig)))
- (cross-mig (%current-target-system)))
- mig))))
+ (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
+ (cross-mig (module-ref cross-base 'cross-mig)))
+ (cross-mig (%current-target-system)))
+ mig))))
(arguments
(substitute-keyword-arguments (package-arguments glibc/hurd)
;; We just pass the flags really needed to build the headers.
@@ -1490,7 +1492,7 @@ command.")
(close-port
(open-output-file
(string-append out "/include/gnu/stubs.h"))))))
- (delete 'build))))) ; nothing to build
+ (delete 'build))))) ; nothing to build
(supported-systems %hurd-systems)))
(define* (libc-for-target #:optional
@@ -1502,6 +1504,31 @@ command.")
(_
glibc)))
+(define-public glibc-locales/hurd
+ (make-glibc-locales glibc/hurd))
+
+(define* (libc-locales-for-target #:optional
+ (target (or (%current-target-system)
+ (%current-system))))
+ (match target
+ ((? target-hurd?)
+ glibc-locales/hurd)
+ (_
+ glibc-locales)))
+
+(define-public glibc-utf8-locales/hurd
+ (hidden-package
+ (make-glibc-utf8-locales glibc/hurd)))
+
+(define* (libc-utf8-locales-for-target #:optional
+ (target (or (%current-target-system)
+ (%current-system))))
+ (match target
+ ((? target-hurd?)
+ glibc-utf8-locales/hurd)
+ (_
+ glibc-utf8-locales)))
+
(define-public tzdata
(package
(name "tzdata")