From 980d7c04a0d4aeaa1790aecc3003f8f60cb74040 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Tue, 1 Dec 2009 20:52:13 +0000
Subject: Patching uclibc for it to cope well with glibc-2.10 and above This
 goes similar to the kernel-headers recent patch for the same file and
 purpose.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18743
---
 pkgs/os-specific/linux/uclibc/default.nix          |  2 ++
 .../os-specific/linux/uclibc/unifdef-getline.patch | 31 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/os-specific/linux/uclibc/unifdef-getline.patch

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 1edcc933e57..33914eea3d6 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation {
     make oldconfig
   '';
 
+  patches = [ ./unifdef-getline.patch ];
+
   installPhase = ''
     mkdir -p $out
     make PREFIX=$out install
diff --git a/pkgs/os-specific/linux/uclibc/unifdef-getline.patch b/pkgs/os-specific/linux/uclibc/unifdef-getline.patch
new file mode 100644
index 00000000000..7e6a50014a3
--- /dev/null
+++ b/pkgs/os-specific/linux/uclibc/unifdef-getline.patch
@@ -0,0 +1,31 @@
+diff --git a/extra/scripts/unifdef.c b/extra/scripts/unifdef.c
+index 552025e..977e682 100644
+--- a/extra/scripts/unifdef.c
++++ b/extra/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;
-- 
cgit 1.4.1