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

Updating uclibc (snapshots).

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2015-02-02 01:03:18 +01:00
parent 389d0f668e
commit c375a6744b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,10 +19,10 @@ let
echo "parseconfig: removing $NAME" echo "parseconfig: removing $NAME"
sed -i /^$NAME=/d .config sed -i /^$NAME=/d .config
if test "$OPTION" != n; then #if test "$OPTION" != n; then
echo "parseconfig: setting $NAME=$OPTION" echo "parseconfig: setting $NAME=$OPTION"
echo "$NAME=$OPTION" >> .config echo "$NAME=$OPTION" >> .config
fi #fi
done done
set +x set +x
} }
@ -43,17 +43,24 @@ let
UCLIBC_SUSV4_LEGACY y UCLIBC_SUSV4_LEGACY y
UCLIBC_HAS_THREADS_NATIVE y UCLIBC_HAS_THREADS_NATIVE y
KERNEL_HEADERS "${linuxHeaders}/include" 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 in
stdenv.mkDerivation { 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); ("-" + cross.config);
src = fetchurl { src = fetchurl {
url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2; url = http://www.uclibc.org/downloads/snapshots/uClibc-20150131.tar.bz2;
sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f"; sha256 = "14svyxw4nizdcz4vqk9nizlgy32d8ngpvcca34jjbdjjg77xdvkc";
}; };
# 'ftw' needed to build acl, a coreutils dependency # 'ftw' needed to build acl, a coreutils dependency