ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: commencement: Use locales for the right libc version on GNU/Hurd.

Browse source 
Fixes <https://issues.guix.gnu.org/66472>.

Until now, we were unconditionally using ‘glibc-utf8-locales’, which
targets the glibc version used on Linux (2.35) rather than that used on
the Hurd (2.37).  This would lead to build failures due to the inability
to use locale encoding when targeting i586-gnu.

* gnu/packages/base.scm (glibc-utf8-locales/hurd): New variable.
* gnu/packages/commencement.scm (glibc-utf8-locales-final/hurd): New
variable.
(%boot5-inputs): Use it when ‘target-hurd?’ returns #t.
(%final-inputs): Likewise.

Change-Id: I1666d615dffbe3561cf2d9612b85cd31a48a7dcd
This commit is contained in:
Ludovic Courtès 2023-11-25 16:17:12 +01:00
parent 5149bf99ba
commit 95ea1277ae
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/base.scm
View file

@ -1512,6 +1512,11 @@ (define-public glibc/hurd-headers
(delete 'build))))) ; nothing to build (delete 'build))))) ; nothing to build
(supported-systems %hurd-systems))) (supported-systems %hurd-systems)))
(define-public glibc-utf8-locales/hurd
;; Locales for the libc version used on GNU/Hurd.
(hidden-package
(make-glibc-utf8-locales glibc/hurd)))
(define* (libc-for-target #:optional (define* (libc-for-target #:optional
(target (or (%current-target-system) (target (or (%current-target-system)
(%current-system)))) (%current-system))))

18
gnu/packages/commencement.scm
View file

@ -3365,6 +3365,16 @@ (define-public glibc-utf8-locales-final
`(("glibc" ,glibc-final) `(("glibc" ,glibc-final)
("gzip" ,(with-boot4 gzip)))))) ("gzip" ,(with-boot4 gzip))))))
(define-public glibc-utf8-locales-final/hurd
;; Locales for the libc version used on GNU/Hurd.
(package
(inherit glibc-utf8-locales/hurd)
(properties `((hidden? . #t)
,@(package-properties glibc-utf8-locales/hurd)))
(native-inputs
`(("glibc" ,glibc-final)
("gzip" ,(with-boot4 gzip))))))
(define-public ld-wrapper (define-public ld-wrapper
;; The final 'ld' wrapper, which uses the final Guile and Binutils. ;; The final 'ld' wrapper, which uses the final Guile and Binutils.
(make-ld-wrapper "ld-wrapper" (make-ld-wrapper "ld-wrapper"
@ -3383,7 +3393,9 @@ (define (%boot5-inputs)
;; Now with UTF-8 locales. Remember that the bootstrap binaries were built ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built
;; with an older libc, which cannot load the new locale format. See ;; with an older libc, which cannot load the new locale format. See
;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>. ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>.
`(("locales" ,glibc-utf8-locales-final) `(("locales" ,(if (target-hurd?)
glibc-utf8-locales-final/hurd
glibc-utf8-locales-final))
,@(%boot4-inputs))) ,@(%boot4-inputs)))
(define with-boot5 (define with-boot5
@ -3484,7 +3496,9 @@ (define-public %final-inputs
("gcc" ,gcc-final) ("gcc" ,gcc-final)
("libc" ,glibc-final) ("libc" ,glibc-final)
("libc:static" ,glibc-final "static") ("libc:static" ,glibc-final "static")
("locales" ,glibc-utf8-locales-final)))))) ("locales" ,(if (target-hurd?)
glibc-utf8-locales-final/hurd
glibc-utf8-locales-final)))))))
(define-public canonical-package (define-public canonical-package
(let ((name->package (mlambda (system) (let ((name->package (mlambda (system)