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

Add armv7l support.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33798
This commit is contained in:
Nicolas Pierron
2012-04-15 23:41:25 +00:00
parent 6a9ac1f016
commit 82b308bf11
31 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@@ -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

4
pkgs/development/compilers/ocaml/cvs.nix
View File

@@ -14,9 +14,9 @@ stdenv.mkDerivation (rec {
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

2
pkgs/development/interpreters/perl/5.10/default.nix
View File

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
''
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")
''}
'';

2
pkgs/development/interpreters/perl/5.14/default.nix
View File

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
''
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")
''}
'';

2
pkgs/development/libraries/freetype/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
"-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";

2
pkgs/development/libraries/glibc/2.13/common.nix
View File

@@ -105,7 +105,7 @@ stdenv.mkDerivation ({
(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"

2
pkgs/development/libraries/glibc/2.14/common.nix
View File

@@ -105,7 +105,7 @@ stdenv.mkDerivation ({
(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"

2
pkgs/development/libraries/glibc/2.9/default.nix
View File

@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
"--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"

2
pkgs/development/libraries/glibc/2.9/headers.nix
View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"--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"

2
pkgs/development/libraries/glibc/2.9/locales.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"--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"

2
pkgs/development/libraries/libxcrypt/default.nix
View File

@@ -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 {