mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: Remove glibc@2.21 and its traces.
* gnu/packages/base.scm (glibc-2.21): Remove. * gnu/system/locale.scm (localedef-command)[maybe-version-directory]: Remove. Replace call with use of 'package-version'. (single-locale-directory): Remove 'version>=' conditional.
This commit is contained in:
parent
578dfbe07b
commit
6d833b13b7
2 changed files with 3 additions and 30 deletions
|
@ -978,23 +978,11 @@ (define-public glibc-2.22
|
||||||
`(modify-phases ,phases
|
`(modify-phases ,phases
|
||||||
(add-before 'configure 'fix-pwd
|
(add-before 'configure 'fix-pwd
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Use `pwd' instead of `/bin/pwd' for glibc-2.21
|
;; Use `pwd' instead of `/bin/pwd' for glibc-2.22.
|
||||||
(substitute* "configure"
|
(substitute* "configure"
|
||||||
(("/bin/pwd") "pwd"))
|
(("/bin/pwd") "pwd"))
|
||||||
#t))))))))
|
#t))))))))
|
||||||
|
|
||||||
(define-public glibc-2.21
|
|
||||||
(package
|
|
||||||
(inherit glibc-2.22)
|
|
||||||
(version "2.21")
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source glibc-2.22))
|
|
||||||
(uri (string-append "mirror://gnu/glibc/glibc-"
|
|
||||||
version ".tar.xz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))))))
|
|
||||||
|
|
||||||
(define-public glibc-locales
|
(define-public glibc-locales
|
||||||
(package
|
(package
|
||||||
(inherit glibc)
|
(inherit glibc)
|
||||||
|
|
|
@ -22,7 +22,6 @@ (define-module (gnu system locale)
|
||||||
#:use-module (guix monads)
|
#:use-module (guix monads)
|
||||||
#:use-module (guix records)
|
#:use-module (guix records)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
|
@ -85,15 +84,6 @@ (define (locale-name->definition name)
|
||||||
(define* (localedef-command locale
|
(define* (localedef-command locale
|
||||||
#:key (libc (canonical-package glibc)))
|
#:key (libc (canonical-package glibc)))
|
||||||
"Return a gexp that runs 'localedef' from LIBC to build LOCALE."
|
"Return a gexp that runs 'localedef' from LIBC to build LOCALE."
|
||||||
(define (maybe-version-directory)
|
|
||||||
;; XXX: For libc prior to 2.22, GuixSD did not store locale data in a
|
|
||||||
;; version-specific sub-directory. Check whether this is the case.
|
|
||||||
;; TODO: Remove this hack once libc 2.21 is buried.
|
|
||||||
(let ((version (package-version libc)))
|
|
||||||
(if (version>=? version "2.22")
|
|
||||||
(list version "/")
|
|
||||||
'())))
|
|
||||||
|
|
||||||
#~(begin
|
#~(begin
|
||||||
(format #t "building locale '~a'...~%"
|
(format #t "building locale '~a'...~%"
|
||||||
#$(locale-definition-name locale))
|
#$(locale-definition-name locale))
|
||||||
|
@ -102,7 +92,7 @@ (define (maybe-version-directory)
|
||||||
"-i" #$(locale-definition-source locale)
|
"-i" #$(locale-definition-source locale)
|
||||||
"-f" #$(locale-definition-charset locale)
|
"-f" #$(locale-definition-charset locale)
|
||||||
(string-append #$output "/"
|
(string-append #$output "/"
|
||||||
#$@(maybe-version-directory)
|
#$(package-version libc) "/"
|
||||||
#$(locale-definition-name locale))))))
|
#$(locale-definition-name locale))))))
|
||||||
|
|
||||||
(define* (single-locale-directory locales
|
(define* (single-locale-directory locales
|
||||||
|
@ -119,12 +109,7 @@ (define build
|
||||||
#~(begin
|
#~(begin
|
||||||
(mkdir #$output)
|
(mkdir #$output)
|
||||||
|
|
||||||
;; XXX: For libcs < 2.22, locale data is stored in the top-level
|
(mkdir (string-append #$output "/" #$version))
|
||||||
;; directory.
|
|
||||||
;; TODO: Remove this hack once libc 2.21 is buried.
|
|
||||||
#$(if (version>=? version "2.22")
|
|
||||||
#~(mkdir (string-append #$output "/" #$version))
|
|
||||||
#~(symlink "." (string-append #$output "/" #$version)))
|
|
||||||
|
|
||||||
;; 'localedef' executes 'gzip' to access compressed locale sources.
|
;; 'localedef' executes 'gzip' to access compressed locale sources.
|
||||||
(setenv "PATH" (string-append #$gzip "/bin"))
|
(setenv "PATH" (string-append #$gzip "/bin"))
|
||||||
|
|
Loading…
Reference in a new issue