all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.
@ 2016-04-10 18:49 Manolis Ragkousis
  2016-04-13 21:07 ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Manolis Ragkousis @ 2016-04-10 18:49 UTC (permalink / raw)
  To: guix-devel

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

Time to start merging wip-hurd to core-updates.  I built core updates
locally and I made sure it doesn't break anything.

Manolis

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

From 2eefef2dea7fa6c027bfe611cfd6bb3a9d17fd94 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Sun, 10 Apr 2016 21:20:51 +0300
Subject: [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers.

* gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel
  agnostic name for the kernel headers.
  [arguments]: Adjust accordingly.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
  [propagated-inputs]: Adjust accordingly.
---
 gnu/packages/base.scm         | 4 ++--
 gnu/packages/commencement.scm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e662827..c9a581d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -494,7 +494,7 @@ 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)))
+   (propagated-inputs `(("kernel-headers" ,linux-libre-headers)))
 
    (outputs '("out" "debug"))
 
@@ -534,7 +534,7 @@ store.")
                            ,version)
 
             (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,
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6dfe5c9..2d4daa6 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -355,7 +355,7 @@
                                    "export CPATH\n"
                                    all "\n"))))
                ,phases)))))
-     (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0))))
+     (propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0))))
      (native-inputs
       `(("texinfo" ,texinfo-boot0)
         ("perl" ,perl-boot0)))
-- 
2.8.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-05-08 19:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-10 18:49 [PATCH] gnu: glibc: Rename linux-headers input to kernel-headers Manolis Ragkousis
2016-04-13 21:07 ` Ludovic Courtès
2016-04-15 12:09   ` Manolis Ragkousis
2016-04-19 15:19     ` Ludovic Courtès
2016-04-23 17:46       ` Manolis Ragkousis
2016-05-08 19:17         ` Ludovic Courtès

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.