diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-11-26 20:55:52 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-26 20:55:52 +0000 |
| commit | a70f26e17866761ef6670fcebaabfe0e65a7b73e (patch) | |
| tree | a97919e417b72bb3d983b3e6e8db0ed6b94e9761 /pkgs/os-specific/linux/kernel-headers | |
| parent | f1f286052e8adf56f2a39836696184c856b02f69 (diff) | |
| download | nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.tar nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.tar.gz nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.tar.bz2 nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.tar.lz nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.tar.xz nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.tar.zst nixpkgs-a70f26e17866761ef6670fcebaabfe0e65a7b73e.zip | |
Fix `kernelHeaders2618' compilation with glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18656
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/2.6.18.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch | 35 |
2 files changed, 37 insertions, 0 deletions
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; + |