me
/
guix
Archived
1
0
Fork 0
Code

gnu: Ungraft glibc. 

* gnu/packages/base.scm (glibc-2.26-patched): Remove variable.
(glibc/linux)[replacement]: Remove.
[source]: Add "glibc-allow-kernel-2.6.32.patch" to patches.
master
Ricardo Wurmus 2018-03-14 17:39:50 +01:00
parent 8c72ed923d
commit 8fdc843f26
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/base.scm
View File

@ -544,7 +544,6 @@ store.")
;; Note: Always use a dot after the minor version since various places rely ;; Note: Always use a dot after the minor version since various places rely
;; on "version-major+minor" to determine where locales are found. ;; on "version-major+minor" to determine where locales are found.
(version "2.26.105-g0890d5379c") (version "2.26.105-g0890d5379c")
(replacement glibc-2.26-patched)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://alpha.gnu.org/gnu/guix/mirror/" (uri (string-append "https://alpha.gnu.org/gnu/guix/mirror/"
@ -563,7 +562,8 @@ store.")
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (search-patches "glibc-ldd-x86_64.patch" (patches (search-patches "glibc-ldd-x86_64.patch"
"glibc-versioned-locpath.patch" "glibc-versioned-locpath.patch"
"glibc-o-largefile.patch")))) "glibc-o-largefile.patch"
"glibc-allow-kernel-2.6.32.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@ -847,14 +847,6 @@ GLIBC/HURD for a Hurd host"
;; Below are old libc versions, which we use mostly to build locale data in ;; Below are old libc versions, which we use mostly to build locale data in
;; the old format (which the new libc cannot cope with.) ;; the old format (which the new libc cannot cope with.)
(define glibc-2.26-patched
(package
(inherit glibc)
(source (origin
(inherit (package-source glibc))
(patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch")
(origin-patches (package-source glibc))))))))
(define-public glibc-2.25 (define-public glibc-2.25
(package (package
(inherit glibc) (inherit glibc)