02/02: gnu: Ungraft glibc.

[Ricardo Wurmus]

rekado pushed a commit to branch core-updates
in repository guix.

commit 8fdc843f26fd0cdbfb3fca679b6cc9f2b4feacc9
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Mar 14 17:39:50 2018 +0100

    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.
---
 gnu/packages/base.scm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f630cce..1481cad 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -544,7 +544,6 @@ store.")
    ;; Note: Always use a dot after the minor version since various places rely
    ;; on "version-major+minor" to determine where locales are found.
    (version "2.26.105-g0890d5379c")
-   (replacement glibc-2.26-patched)
    (source (origin
             (method url-fetch)
             (uri (string-append "https://alpha.gnu.org/gnu/guix/mirror/";
@@ -563,7 +562,8 @@ store.")
             (modules '((guix build utils)))
             (patches (search-patches "glibc-ldd-x86_64.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)
 
    ;; 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
 ;; 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
   (package
     (inherit glibc)