diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2015-02-02 01:03:18 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2015-02-05 22:59:05 +0100 |
| commit | c375a6744b66ba3793147dff033bd6ae663043e7 (patch) | |
| tree | 7985153736cf67fd0975f66517e6afe3ed977c84 /pkgs/os-specific/linux/uclibc | |
| parent | 389d0f668e8722a13f16b20aa2d13941b00e4783 (diff) | |
| download | nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.tar nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.tar.gz nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.tar.bz2 nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.tar.lz nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.tar.xz nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.tar.zst nixpkgs-c375a6744b66ba3793147dff033bd6ae663043e7.zip | |
Updating uclibc (snapshots).
I also update the way the configuration is generated, so it works for our ARM EABI, armv5tel. We will have to enable the FPU for armv6 and beyond. Conflicts: pkgs/os-specific/linux/uclibc/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/uclibc')
| -rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 1b866711225..b856a788348 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -19,10 +19,10 @@ let echo "parseconfig: removing $NAME" sed -i /^$NAME=/d .config - if test "$OPTION" != n; then + #if test "$OPTION" != n; then echo "parseconfig: setting $NAME=$OPTION" echo "$NAME=$OPTION" >> .config - fi + #fi done set +x } @@ -43,17 +43,24 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" + '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) '' + CONFIG_ARM_EABI y + ARCH_WANTS_BIG_ENDIAN n + ARCH_BIG_ENDIAN n + ARCH_WANTS_LITTLE_ENDIAN y + ARCH_LITTLE_ENDIAN y + UCLIBC_HAS_FPU n ''; in stdenv.mkDerivation { - name = "uclibc-0.9.34-pre-20141215" + stdenv.lib.optionalString (cross != null) + name = "uclibc-0.9.34-pre-20150131" + stdenv.lib.optionalString (cross != null) ("-" + cross.config); src = fetchurl { - url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2; - sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f"; + url = http://www.uclibc.org/downloads/snapshots/uClibc-20150131.tar.bz2; + sha256 = "14svyxw4nizdcz4vqk9nizlgy32d8ngpvcca34jjbdjjg77xdvkc"; }; # 'ftw' needed to build acl, a coreutils dependency |