Author: NicolasPierron
Date: Sun Apr 15 23:41:25 2012
New Revision: 33798
URL: https://nixos.org/websvn/nix/?rev=33798&sc=1
Log:
Add armv7l support.
Added:
nixpkgs/trunk/pkgs/stdenv/linux/bootstrap/armv7l/
nixpkgs/trunk/pkgs/stdenv/linux/bootstrap/armv7l/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix
nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix
nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix
nixpkgs/trunk/pkgs/development/compilers/ocaml/cvs.nix
nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix
nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix
nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/default.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/headers.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/locales.nix
nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix
nixpkgs/trunk/pkgs/lib/platforms.nix
nixpkgs/trunk/pkgs/lib/systems.nix
nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.4.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/pam_unix2/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix
nixpkgs/trunk/pkgs/stdenv/default.nix
nixpkgs/trunk/pkgs/stdenv/generic/default.nix
nixpkgs/trunk/pkgs/stdenv/linux/default.nix
nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -2,7 +2,7 @@
, enableX11 ? true}:
let
- nativeCode = if stdenv.system == "armv5tel-linux" then false else true;
+ nativeCode = if stdenv.isArm then false else true;
in
stdenv.mkDerivation (rec {
Modified: nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -76,7 +76,7 @@
if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
- if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
+ if stdenv.isArm then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
Modified: nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -84,7 +84,7 @@
if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
- if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
+ if stdenv.isArm then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
Modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/compilers/ocaml/3.12.1.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, ncurses, x11 }:
let
- useX11 = stdenv.system != "armv5tel-linux";
- useNativeCompilers = stdenv.system != "armv5tel-linux";
+ useX11 = !stdenv.isArm;
+ useNativeCompilers = !stdenv.isArm;
inherit (stdenv.lib) optionals optionalString;
in
Modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/cvs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ocaml/cvs.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/compilers/ocaml/cvs.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -14,9 +14,9 @@
prefixKey = "-prefix ";
configureFlags = ["-no-tk"];
buildFlags = "world" +
- (if (stdenv.system != "armv5tel-linux") then "bootstrap world.opt" else
"");
+ (if !stdenv.isArm then "bootstrap world.opt" else "");
buildInputs = [ncurses];
- installTargets = "install" + (if (stdenv.system != "armv5tel-linux") then
"installopt" else "");
+ installTargets = "install" + (if !stdenv.isArm then "installopt" else "");
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/5.10/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -45,7 +45,7 @@
''
configureFlags="$configureFlags -Dprefix=$out
-Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
- ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") ''
+ ${stdenv.lib.optionalString stdenv.isArm ''
configureFlagsArray=(-Dldflags="-lm -lrt")
''}
'';
Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -46,7 +46,7 @@
''
configureFlags="$configureFlags -Dprefix=$out
-Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
- ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") ''
+ ${stdenv.lib.optionalString stdenv.isArm ''
configureFlagsArray=(-Dldflags="-lm -lrt")
''}
'';
Modified: nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -19,7 +19,7 @@
"-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1";
# The asm for armel is written with the 'asm' keyword.
- CFLAGS = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux")
"-std=gnu99";
+ CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
meta = {
description = "A font rendering engine";
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -105,7 +105,7 @@
(if cross.float == "soft" then "--without-fp" else "--with-fp")
"--enable-kernel=2.6.0"
"--with-__thread"
- ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
+ ] ++ stdenv.lib.optionals stdenv.isArm [
"--host=arm-linux-gnueabi"
"--build=arm-linux-gnueabi"
"--without-fp"
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.14/common.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -105,7 +105,7 @@
(if cross.float == "soft" then "--without-fp" else "--with-fp")
"--enable-kernel=2.6.0"
"--with-__thread"
- ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
+ ] ++ stdenv.lib.optionals stdenv.isArm [
"--host=arm-linux-gnueabi"
"--build=arm-linux-gnueabi"
"--without-fp"
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -72,7 +72,7 @@
"--enable-kernel=2.6.0"
"--without-fp"
"--with-__thread"
- ] ++ (if (stdenv.system == "armv5tel-linux") then [
+ ] ++ (if stdenv.isArm then [
"--host=arm-linux-gnueabi"
"--build=arm-linux-gnueabi"
"--without-fp"
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/headers.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/headers.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/headers.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -32,7 +32,7 @@
"--disable-sanity-checks"
"--enable-hacker-mode"
(if profilingLibraries then "--enable-profile" else "--disable-profile")
- ] ++ (if (stdenv.system == "armv5tel-linux") then [
+ ] ++ (if stdenv.isArm then [
"--host=arm-linux-gnueabi"
"--build=arm-linux-gnueabi"
"--without-fp"
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/locales.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/locales.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.9/locales.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -29,7 +29,7 @@
"--enable-add-ons"
"--without-headers"
"--disable-profile"
- ] ++ (if (stdenv.system == "armv5tel-linux") then [
+ ] ++ (if stdenv.isArm then [
"--host=arm-linux-gnueabi"
"--build=arm-linux-gnueabi"
"--without-fp"
Modified: nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
# I could not build it in armv5tel-linux or the fuloon2f
-assert stdenv.system != "armv5tel-linux";
+assert !stdenv.isArm;
assert stdenv.system != "mips64el-linux";
stdenv.mkDerivation {
Modified: nixpkgs/trunk/pkgs/lib/platforms.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/platforms.nix Sun Apr 15 23:38:38 2012
(r33797)
+++ nixpkgs/trunk/pkgs/lib/platforms.nix Sun Apr 15 23:41:25 2012
(r33798)
@@ -3,7 +3,7 @@
rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
- "mips64el-linux"];
+ "armv7l-linux" "mips64el-linux"];
darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
openbsd = ["i686-openbsd" "x86_64-openbsd"];
Modified: nixpkgs/trunk/pkgs/lib/systems.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/systems.nix Sun Apr 15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/lib/systems.nix Sun Apr 15 23:41:25 2012 (r33798)
@@ -30,6 +30,7 @@
setTypes "cpu-type" {
arm = { bits = 32; significantByte = littleEndian; };
armv5tel = { bits = 32; significantByte = littleEndian; };
+ armv7l = { bits = 32; significantByte = littleEndian; };
i686 = { bits = 32; significantByte = littleEndian; };
powerpc = { bits = 32; significantByte = bigEndian; };
x86_64 = { bits = 64; significantByte = littleEndian; };
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -12,7 +12,7 @@
# We get a warning in armv5tel-linux and the fuloong2f,
# so we disable -Werror in it
- patchPhase = if (stdenv.system == "armv5tel-linux" ||
+ patchPhase = if (stdenv.isArm ||
stdenv.system == "mips64el-linux")
then ''
sed -i s/-Werror// src/Makefile.am
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.4.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.4.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -25,7 +25,7 @@
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
- if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.isArm then "arm" else
abort "don't know what the kernel include directory is called for this
platform";
buildInputs = [perl];
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -19,7 +19,7 @@
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
- if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.isArm then "arm" else
if stdenv.system == "mips64el-linux" then "mips" else
abort "don't know what the kernel include directory is called for this
platform";
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -25,7 +25,7 @@
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
- if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this
platform";
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/default.nix Sun Apr
15 23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -25,7 +25,7 @@
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
- if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this
platform";
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -46,7 +46,7 @@
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
- || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux";
+ || stdenv.isArm || stdenv.system == "mips64el-linux";
assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
@@ -101,7 +101,7 @@
if userModeLinux then "um" else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
- if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.isArm then "arm" else
if stdenv.system == "mips64el-linux" then "mips" else
abort "Platform ${stdenv.system} is not supported.";
Modified: nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -11,11 +11,11 @@
buildNativeInputs = [ flex ];
buildInputs = [ cracklib ]
++ stdenv.lib.optional
- (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64el-linux")
+ (stdenv.isArm && stdenv.system != "mips64el-linux")
libxcrypt;
crossAttrs = {
- # Skip libxcrypt cross-building, as it fails for mips and armv5tel
+ # Skip libxcrypt cross-building, as it fails for mips and arm
propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ];
preConfigure = preConfigure + ''
ar x ${flex.hostDrv}/lib/libfl.a
Modified: nixpkgs/trunk/pkgs/os-specific/linux/pam_unix2/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/pam_unix2/default.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/pam_unix2/default.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -8,7 +8,7 @@
sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
};
- buildInputs = [ pam ] ++ stdenv.lib.optional (stdenv.system !=
"armv5tel-linux") libxcrypt;
+ buildInputs = [ pam ] ++ stdenv.lib.optional (!stdenv.isArm) libxcrypt;
meta = {
homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2;
Modified: nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix Sun Apr 15 23:38:38
2012 (r33797)
+++ nixpkgs/trunk/pkgs/os-specific/linux/udev/173.nix Sun Apr 15 23:41:25
2012 (r33798)
@@ -49,7 +49,7 @@
url = https://bugs.archlinux.org/task/25356?getfile=7281;
sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm";
})] ++
- stdenv.lib.optional (stdenv.system == "armv5tel-linux")
./pre-accept4-kernel.patch;
+ stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch;
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
Modified: nixpkgs/trunk/pkgs/stdenv/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/default.nix Sun Apr 15 23:38:38 2012
(r33797)
+++ nixpkgs/trunk/pkgs/stdenv/default.nix Sun Apr 15 23:41:25 2012
(r33798)
@@ -55,6 +55,7 @@
if stdenvType == "i686-linux" then stdenvLinux else
if stdenvType == "x86_64-linux" then stdenvLinux else
if stdenvType == "armv5tel-linux" then stdenvLinux else
+ if stdenvType == "armv7l-linux" then stdenvLinux else
if stdenvType == "mips64el-linux" then stdenvLinux else
if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
if stdenvType == "i686-mingw" then stdenvMinGW else
Modified: nixpkgs/trunk/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/generic/default.nix Sun Apr 15 23:38:38
2012 (r33797)
+++ nixpkgs/trunk/pkgs/stdenv/generic/default.nix Sun Apr 15 23:41:25
2012 (r33798)
@@ -93,6 +93,7 @@
|| result.system == "x86_64-linux"
|| result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"
+ || result.system == "armv7l-linux"
|| result.system == "mips64el-linux";
isGNU = result.system == "i686-gnu"; # GNU/Hurd
isSunOS = result.system == "i686-solaris"
@@ -120,7 +121,8 @@
|| result.system == "x86_64-darwin";
isMips = result.system == "mips-linux"
|| result.system == "mips64el-linux";
- isArm = result.system == "armv5tel-linux";
+ isArm = result.system == "armv5tel-linux"
+ || result.system == "armv7l-linux";
# Utility function: allow stdenv to be easily regenerated with
# a different setup script. (See all-packages.nix for an
Added: nixpkgs/trunk/pkgs/stdenv/linux/bootstrap/armv7l/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/stdenv/linux/bootstrap/armv7l/default.nix Sun Apr
15 23:41:25 2012 (r33798)
@@ -0,0 +1,3 @@
+# rely on ARM backward compatibility to build armv7l binaries with the
+# bootstrap tools of armv5tel.
+import ../armv5tel
\ No newline at end of file
Modified: nixpkgs/trunk/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/linux/default.nix Sun Apr 15 23:38:38 2012
(r33797)
+++ nixpkgs/trunk/pkgs/stdenv/linux/default.nix Sun Apr 15 23:41:25 2012
(r33798)
@@ -16,6 +16,7 @@
else if system == "x86_64-linux" then import ./bootstrap/x86_64
else if system == "powerpc-linux" then import ./bootstrap/powerpc
else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
+ else if system == "armv7l-linux" then import ./bootstrap/armv5tel
else if system == "mips64el-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
Modified: nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix Sun Apr 15
23:38:38 2012 (r33797)
+++ nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix Sun Apr 15
23:41:25 2012 (r33798)
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "gnutar-1.26";
src = fetchurl {
@@ -32,4 +32,9 @@
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
-}
\ No newline at end of file
+}
+ # May have some issues with root compilation because the bootstrap tool
+ # cannot be used as a login shell for now.
+// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") {
+ FORCE_UNSAFE_CONFIGURE = 1;
+})
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 15 23:38:38
2012 (r33797)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 15 23:41:25
2012 (r33798)
@@ -1883,7 +1883,7 @@
gettext which noSysDirs;
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
- profiledCompiler = if stdenv.system == "armv5tel-linux" then false else
true;
+ profiledCompiler = if stdenv.isArm then false else true;
# When building `gcc.hostDrv' (a "Canadian cross", with host == target
# and host != build), `cross' must be null but the cross-libc must still
@@ -1912,7 +1912,7 @@
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
- profiledCompiler = if stdenv.system == "armv5tel-linux" then false else
true;
+ profiledCompiler = if stdenv.isArm then false else true;
# When building `gcc.hostDrv' (a "Canadian cross", with host == target
# and host != build), `cross' must be null but the cross-libc must still
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
