Author: viric
Date: Thu Sep 2 19:18:04 2010
New Revision: 23602
URL: https://svn.nixos.org/websvn/nix/?rev=23602&sc=1
Log:
Fixing the evaluation of cross built uclibc in the case of lacking extraConfig
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/uclibc/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/release-cross.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/uclibc/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/uclibc/default.nix
Thu Sep 2 18:41:48 2010 (r23601)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/uclibc/default.nix
Thu Sep 2 19:18:04 2010 (r23602)
@@ -64,7 +64,7 @@
cat << EOF | parseconfig
${nixConfig}
${extraConfig}
- ${if cross != null then cross.uclibc.extraConfig else ""}
+ ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ]
"" cross else ""}
$extraCrossConfig
EOF
make oldconfig
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/release-cross.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/release-cross.nix Thu Sep
2 18:41:48 2010 (r23601)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/release-cross.nix Thu Sep
2 19:18:04 2010 (r23602)
@@ -4,9 +4,10 @@
/* Basic list of packages to cross-build */
basicHostDrv = {
+ gccCrossStageFinal = nativePlatforms;
bison.hostDrv = nativePlatforms;
busybox.hostDrv = nativePlatforms;
- coreutils_real.hostDrv = nativePlatforms;
+ coreutils.hostDrv = nativePlatforms;
dropbear.hostDrv = nativePlatforms;
tightvnc.hostDrv = nativePlatforms;
#openoffice.hostDrv = nativePlatforms;
@@ -18,6 +19,8 @@
nixUnstable.hostDrv = nativePlatforms;
linuxPackages_2_6_32.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,
@@ -63,6 +66,13 @@
platform = pkgs.platforms.sheevaplug;
libc = "uclibc";
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 {
@@ -135,7 +145,6 @@
in {
crossMingw32 = mapTestOnCross crossSystem {
windows.wxMSW.hostDrv = nativePlatforms;
- gccCrossStageFinal = nativePlatforms;
};
}) // (
@@ -153,7 +162,6 @@
};
in {
crossGNU = mapTestOnCross crossSystem {
- gccCrossStageFinal = nativePlatforms;
hurdCross = nativePlatforms;
mach.hostDrv = nativePlatforms;
@@ -194,7 +202,6 @@
};
in {
fuloongminipc = mapTestOnCross crossSystem {
- gccCrossStageFinal = nativePlatforms;
coreutils_real.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms;
@@ -255,7 +262,6 @@
};
in {
nanonote = mapTestOnCross crossSystem {
- gccCrossStageFinal = nativePlatforms;
coreutils_real.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
