diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-01 20:52:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-01 20:52:13 +0000 |
| commit | 980d7c04a0d4aeaa1790aecc3003f8f60cb74040 (patch) | |
| tree | 8e1ac3c9d8224e4dd70f66909704302b66130a8b /pkgs/os-specific/linux/uclibc | |
| parent | fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc (diff) | |
| download | nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.tar nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.tar.gz nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.tar.bz2 nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.tar.lz nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.tar.xz nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.tar.zst nixpkgs-980d7c04a0d4aeaa1790aecc3003f8f60cb74040.zip | |
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
Diffstat (limited to 'pkgs/os-specific/linux/uclibc')
| -rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/uclibc/unifdef-getline.patch | 31 |
2 files changed, 33 insertions, 0 deletions
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; |