[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67824] [PATCH core-updates v2 1/9] packages: Remove reference to ‘g
From: |
Ludovic Courtès |
Subject: |
[bug#67824] [PATCH core-updates v2 1/9] packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’. |
Date: |
Mon, 18 Dec 2023 17:30:12 +0100 |
This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.
* guix/packages.scm (%standard-patch-inputs): Remove “locales” entry.
(patch-and-repack): Remove ‘locales’ variable.
[build]: Remove reference to ‘locales’. Use “C.UTF-8” unconditionally.
Change-Id: I54219b232880e05534599fbba8738cc00fb5d568
---
guix/packages.scm | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 930b1a3b0e..4b0c478ff4 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -866,13 +866,7 @@ (define (%standard-patch-inputs system)
("gzip" ,(ref '(gnu packages compression) 'gzip))
("lzip" ,(ref '(gnu packages compression) 'lzip))
("unzip" ,(ref '(gnu packages compression) 'unzip))
- ("patch" ,(ref '(gnu packages base) 'patch))
- ("locales"
- ,(parameterize ((%current-target-system #f)
- (%current-system system))
- (canonical
- ((module-ref (resolve-interface '(gnu packages base))
- 'libc-utf8-locales-for-target))))))))
+ ("patch" ,(ref '(gnu packages base) 'patch)))))
(define (default-guile)
"Return the default Guile package used to run the build code of
@@ -955,7 +949,6 @@ (define* (patch-and-repack source patches
(lzip (lookup-input "lzip"))
(xz (lookup-input "xz"))
(patch (lookup-input "patch"))
- (locales (lookup-input "locales"))
(comp (and=> (compressor source-file-name) lookup-input))
(patches (map instantiate-patch patches)))
(define build
@@ -1017,15 +1010,17 @@ (define* (patch-and-repack source patches
;; Encoding/decoding errors shouldn't be silent.
(fluid-set! %default-port-conversion-strategy 'error)
- (when #+locales
- ;; First of all, install a UTF-8 locale so that UTF-8 file names
- ;; are correctly interpreted. During bootstrap, LOCALES is #f.
- (setenv "LOCPATH"
- (string-append #+locales "/lib/locale/"
- #+(and locales
- (version-major+minor
- (package-version locales)))))
- (setlocale LC_ALL "en_US.utf8"))
+ ;; First of all, install a UTF-8 locale so that UTF-8 file names
+ ;; are correctly interpreted. During bootstrap, locales are
+ ;; missing.
+ (let ((locale "C.UTF-8"))
+ (catch 'system-error
+ (lambda ()
+ (setlocale LC_ALL locale))
+ (lambda args
+ (format (current-error-port)
+ "failed to install '~a' locale: ~a~%"
+ locale (system-error-errno args)))))
(setenv "PATH"
(string-append #+xz "/bin"
--
2.41.0
- [bug#67824] [PATCH core-updates 2/6] build-system/gnu: Change default locale to C.UTF-8., (continued)
- [bug#67824] [PATCH core-updates 2/6] build-system/gnu: Change default locale to C.UTF-8., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 3/6] gnu: commencement: Remove ‘glibc-utf8-locales’ from ‘%final-inputs’., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 5/6] packages: Output and error ports are line-buffered in ‘patch-and-repack’., Ludovic Courtès, 2023/12/14
- [bug#67824] [PATCH core-updates 4/6] profiles: Use C.UTF-8 instead of ‘glibc-utf8-locales’ where possible., Ludovic Courtès, 2023/12/14
- [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 <=
- [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, 2023/12/18
- [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