nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Add glibc 2.22. 

* gnu/packages/base.scm (glibc-2.22): New variable.
(glibc-2.21): Inherit from it; remove 'arguments' field.
This commit is contained in:
Ludovic Courtès 2016-07-30 13:14:36 +02:00
parent 716753cb97
commit c2c54ebd91
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/base.scm
View File

@ -719,19 +719,19 @@ GLIBC/HURD for a Hurd host"
(define-syntax glibc (define-syntax glibc
(identifier-syntax (glibc-for-target))) (identifier-syntax (glibc-for-target)))
(define-public glibc-2.21 (define-public glibc-2.22
;; The old libc, which we use mostly to build locale data in the old format ;; The old libc, which we use mostly to build locale data in the old format
;; (which the new libc can cope with.) ;; (which the new libc can cope with.)
(package (package
(inherit glibc) (inherit glibc)
(version "2.21") (version "2.22")
(source (origin (source (origin
(inherit (package-source glibc)) (inherit (package-source glibc))
(uri (string-append "mirror://gnu/glibc/glibc-" (uri (string-append "mirror://gnu/glibc/glibc-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf")) "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb"))
(patches (search-patches "glibc-ldd-x86_64.patch")))) (patches (search-patches "glibc-ldd-x86_64.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments glibc) (substitute-keyword-arguments (package-arguments glibc)
@ -743,6 +743,21 @@ GLIBC/HURD for a Hurd host"
(substitute* "configure" (substitute* "configure"
(("/bin/pwd") "pwd")))))))))) (("/bin/pwd") "pwd"))))))))))
(define-public glibc-2.21
;; The old libc, which we use mostly to build locale data in the old format
;; (which the new libc can cope with.)
(package
(inherit glibc-2.22)
(version "2.21")
(source (origin
(inherit (package-source glibc))
(uri (string-append "mirror://gnu/glibc/glibc-"
version ".tar.xz"))
(sha256
(base32
"1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))
(patches (search-patches "glibc-ldd-x86_64.patch"))))))
(define-public glibc-locales (define-public glibc-locales
(package (package
(inherit glibc) (inherit glibc)