[PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to "kernel-headers".

[Manolis Ragkousis <manolis837@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

Hello everyone,

This patch applies to wip-hurd.

Manolis

[-- Attachment #2: 0001-gnu-glibc-linux-Rename-linux-headers-input-to-kernel.patch --]
[-- Type: text/x-patch, Size: 2437 bytes --]

From f9759a80030e11dfb8257f2334d5ce8f5d009cc7 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 14 Aug 2015 14:00:16 +0300
Subject: [PATCH 1/2] gnu: glibc/linux: Rename "linux-headers" input to
 "kernel-headers".

* gnu/packages/base.scm (glibc/linux)[propagated-inputs]: Rename to "kernel-headers".
  (glibc/hurd)[arguments]: Adjust accordingly.
---
 gnu/packages/base.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index bbc6554..b3d9efa 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -465,7 +465,8 @@ store.")
 
    ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
    ;; users should automatically pull Linux headers as well.
-   (propagated-inputs `(("linux-headers" ,linux-libre-headers)))
+   ;; Use kernel-headers for consistency between the two glibcs.
+   (propagated-inputs `(("kernel-headers" ,linux-libre-headers)))
 
    (outputs '("out" "debug"))
 
@@ -501,7 +502,7 @@ store.")
             (string-append "libc_cv_localedir=/run/current-system/locale")
 
             (string-append "--with-headers="
-                           (assoc-ref %build-inputs "linux-headers")
+                           (assoc-ref %build-inputs "kernel-headers")
                            "/include")
 
             ;; This is the default for most architectures as of GNU libc 2.21,
@@ -657,14 +658,8 @@ with the Linux kernel.")
                        ;; Disable it.
                        "--disable-nscd")
                  (filter (lambda (flag)
-                           (not (or (string-prefix? "--with-headers=" flag)
-                                    (string-prefix? "--enable-kernel=" flag))))
-                         ;; Evaluate 'original-configure-flags' in a
-                         ;; lexical environment that has a dummy
-                         ;; "linux-headers" input, to prevent errors.
-                         (let ((%build-inputs `(("linux-headers" . "@DUMMY@")
-                                                ,@%build-inputs)))
-                           ,original-configure-flags))))))))
+                           (not (string-prefix? "--enable-kernel=" flag)))
+                         ,original-configure-flags)))))))
 
 (define* (glibc-for-target #:optional
                            (target (or (%current-target-system)
-- 
2.5.0