09/89: gnu: Add libc-locales-for-target and glibc-locales/hurd.

[guix-commits]

janneke pushed a commit to branch hurd-team
in repository guix.

commit c4475d92f8cadb1ada4af5a7a9af7a752e5f13c6
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 | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 304b0713ee..86e7f0bcdc 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))
 
@@ -1450,10 +1452,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.
@@ -1485,6 +1487,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")