public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating uclibc

Browse Source 
svn path=/nixpkgs/trunk/; revision=20501
This commit is contained in:
Lluís Batlle i Rossell 2010-03-09 15:51:45 +00:00
parent 1522caa556
commit 5fc076193c
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/uclibc/default.nix
View File

@ -23,12 +23,12 @@ let
crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else "";
in in
stdenv.mkDerivation { 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); ("-" + cross.config);
src = fetchurl { src = fetchurl {
url = http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2; url = http://www.uclibc.org/downloads/uClibc-0.9.30.2.tar.bz2;
sha256 = "132cf27hkgi0q4qlwbiyj4ffj76sja0jcxm0aqzzgks65jh6k5rd"; sha256 = "0wr4hlybssiyswdc73wdcxr31xfbss3lnqiv5lcav3rg3v4r4vmb";
}; };
configurePhase = '' configurePhase = ''
@ -52,11 +52,6 @@ stdenv.mkDerivation {
buildInputs = stdenv.lib.optional (gccCross != null) gccCross; 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 = '' installPhase = ''
mkdir -p $out mkdir -p $out
make PREFIX=$out VERBOSE=1 install ${crossMakeFlag} make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}

31
pkgs/os-specific/linux/uclibc/unifdef-getline.patch
View File

@ -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;