From 5fc076193cf8c60027b8c07221265968bcce4242 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 9 Mar 2010 15:51:45 +0000 Subject: Updating uclibc svn path=/nixpkgs/trunk/; revision=20501 --- pkgs/os-specific/linux/uclibc/default.nix | 11 +++----- .../os-specific/linux/uclibc/unifdef-getline.patch | 31 ---------------------- 2 files changed, 3 insertions(+), 39 deletions(-) delete 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 75fa6a701de..0811e8e3e80 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -23,12 +23,12 @@ let crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; in stdenv.mkDerivation { - name = "uclibc-0.9.30.1" + stdenv.lib.optionalString (cross != null) + name = "uclibc-0.9.30.2" + stdenv.lib.optionalString (cross != null) ("-" + cross.config); src = fetchurl { - url = http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2; - sha256 = "132cf27hkgi0q4qlwbiyj4ffj76sja0jcxm0aqzzgks65jh6k5rd"; + url = http://www.uclibc.org/downloads/uClibc-0.9.30.2.tar.bz2; + sha256 = "0wr4hlybssiyswdc73wdcxr31xfbss3lnqiv5lcav3rg3v4r4vmb"; }; configurePhase = '' @@ -52,11 +52,6 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional (gccCross != null) gccCross; - patches = [ ./unifdef-getline.patch ]; - -# # This will allow the usual gcc-cross-wrapper strip phase work as usual -# crossConfig = if (cross != null) then cross.config else null; - installPhase = '' mkdir -p $out make PREFIX=$out VERBOSE=1 install ${crossMakeFlag} diff --git a/pkgs/os-specific/linux/uclibc/unifdef-getline.patch b/pkgs/os-specific/linux/uclibc/unifdef-getline.patch deleted file mode 100644 index 7e6a50014a3..00000000000 --- a/pkgs/os-specific/linux/uclibc/unifdef-getline.patch +++ /dev/null @@ -1,31 +0,0 @@ -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