mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Fix `kernelHeaders2618' compilation with glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18656
This commit is contained in:
parent
f1f286052e
commit
a70f26e178
@ -10,6 +10,8 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "24f0e0011cdae42e3dba56107bb6a60c57c46d1d688a9b0300fec53e80fd1e53";
|
sha256 = "24f0e0011cdae42e3dba56107bb6a60c57c46d1d688a9b0300fec53e80fd1e53";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./unifdef-getline.patch ];
|
||||||
|
|
||||||
buildInputs = [ unifdef ];
|
buildInputs = [ unifdef ];
|
||||||
|
|
||||||
platform =
|
platform =
|
||||||
|
35
pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
Normal file
35
pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
Normal file
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user