From a70f26e17866761ef6670fcebaabfe0e65a7b73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 26 Nov 2009 20:55:52 +0000
Subject: [PATCH] Fix `kernelHeaders2618' compilation with glibc 2.11.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18656
---
 .../linux/kernel-headers/2.6.18.5.nix         |  2 ++
 .../kernel-headers/unifdef-getline.patch      | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix b/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix
index cf4efd159e8..5ecdd77fb87 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256 = "24f0e0011cdae42e3dba56107bb6a60c57c46d1d688a9b0300fec53e80fd1e53";
   };
 
+  patches = [ ./unifdef-getline.patch ];
+
   buildInputs = [ unifdef ];
 
   platform = 
diff --git a/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch b/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
new file mode 100644
index 00000000000..8caabfd3286
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
@@ -0,0 +1,35 @@
+This patch fixes a trivial compilation error with glibc 2.11.
+From http://patchwork.kernel.org/patch/11166/ .
+
+diff --git a/scripts/unifdef.c b/scripts/unifdef.c
+index 552025e..977e682 100644
+--- a/scripts/unifdef.c
++++ b/scripts/unifdef.c
+@@ -206,7 +206,7 @@  static void             done(void);
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
+-static Linetype         getline(void);
++static Linetype         parseline(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);
+ static void             ignoreon(void);
+@@ -512,7 +512,7 @@  process(void)
+ 
+ 	for (;;) {
+ 		linenum++;
+-		lineval = getline();
++		lineval = parseline();
+ 		trans_table[ifstate[depth]][lineval]();
+ 		debug("process %s -> %s depth %d",
+ 		    linetype_name[lineval],
+@@ -526,7 +526,7 @@  process(void)
+  * help from skipcomment().
+  */
+ static Linetype
+-getline(void)
++parseline(void)
+ {
+ 	const char *cp;
+ 	int cursym;
+