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

Fixing the evaluation of cross built uclibc in the case of lacking extraConfig

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23602
This commit is contained in:
Lluís Batlle i Rossell 2010-09-02 19:18:04 +00:00
parent 6013c0cf8b
commit 14a20b7179
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ stdenv.mkDerivation {
cat << EOF | parseconfig cat << EOF | parseconfig
${nixConfig} ${nixConfig}
${extraConfig} ${extraConfig}
${if cross != null then cross.uclibc.extraConfig else ""} ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""}
$extraCrossConfig $extraCrossConfig
EOF EOF
make oldconfig make oldconfig

16
pkgs/top-level/release-cross.nix
View File

@ -4,9 +4,10 @@ let
/* Basic list of packages to cross-build */ /* Basic list of packages to cross-build */
basicHostDrv = { basicHostDrv = {
gccCrossStageFinal = nativePlatforms;
bison.hostDrv = nativePlatforms; bison.hostDrv = nativePlatforms;
busybox.hostDrv = nativePlatforms; busybox.hostDrv = nativePlatforms;
coreutils_real.hostDrv = nativePlatforms; coreutils.hostDrv = nativePlatforms;
dropbear.hostDrv = nativePlatforms; dropbear.hostDrv = nativePlatforms;
tightvnc.hostDrv = nativePlatforms; tightvnc.hostDrv = nativePlatforms;
#openoffice.hostDrv = nativePlatforms; #openoffice.hostDrv = nativePlatforms;
@ -18,6 +19,8 @@ let
nixUnstable.hostDrv = nativePlatforms; nixUnstable.hostDrv = nativePlatforms;
linuxPackages_2_6_32.kernel.hostDrv = linux; linuxPackages_2_6_32.kernel.hostDrv = linux;
linuxPackages_2_6_33.kernel.hostDrv = linux; linuxPackages_2_6_33.kernel.hostDrv = linux;
linuxPackages_2_6_34.kernel.hostDrv = linux;
linuxPackages_2_6_35.kernel.hostDrv = linux;
}; };
/* Basic list of packages to be natively built, /* Basic list of packages to be natively built,
@ -63,6 +66,13 @@ let
platform = pkgs.platforms.sheevaplug; platform = pkgs.platforms.sheevaplug;
libc = "uclibc"; libc = "uclibc";
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
uclibc.extraConfig = ''
CONFIG_ARM_OABI n
CONFIG_ARM_EABI y
ARCH_BIG_ENDIAN n
ARCH_WANTS_BIG_ENDIAN n
ARCH_WANTS_LITTLE_ENDIAN y
'';
}; };
in { in {
@ -135,7 +145,6 @@ let
in { in {
crossMingw32 = mapTestOnCross crossSystem { crossMingw32 = mapTestOnCross crossSystem {
windows.wxMSW.hostDrv = nativePlatforms; windows.wxMSW.hostDrv = nativePlatforms;
gccCrossStageFinal = nativePlatforms;
}; };
}) // ( }) // (
@ -153,7 +162,6 @@ let
}; };
in { in {
crossGNU = mapTestOnCross crossSystem { crossGNU = mapTestOnCross crossSystem {
gccCrossStageFinal = nativePlatforms;
hurdCross = nativePlatforms; hurdCross = nativePlatforms;
mach.hostDrv = nativePlatforms; mach.hostDrv = nativePlatforms;
@ -194,7 +202,6 @@ let
}; };
in { in {
fuloongminipc = mapTestOnCross crossSystem { fuloongminipc = mapTestOnCross crossSystem {
gccCrossStageFinal = nativePlatforms;
coreutils_real.hostDrv = nativePlatforms; coreutils_real.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms;
@ -255,7 +262,6 @@ let
}; };
in { in {
nanonote = mapTestOnCross crossSystem { nanonote = mapTestOnCross crossSystem {
gccCrossStageFinal = nativePlatforms;
coreutils_real.hostDrv = nativePlatforms; coreutils_real.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms;