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

Changing every reference from mips64-linux to mips64el-linux. That's

Browse Source 
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
This commit is contained in:
Lluís Batlle i Rossell 2012-01-21 00:34:51 +00:00
parent e6c1aa2005
commit 4a1c721c01
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/clang-wrapper/default.nix
View File

@ -78,7 +78,7 @@ stdenv.mkDerivation {
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.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64-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")
else "";
}

2
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -86,7 +86,7 @@ stdenv.mkDerivation {
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.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64-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")
else "";
}

4
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -260,8 +260,8 @@ stdenv.mkDerivation ({
)
)
}
${ # Trick that should be taken out once we have a mips64-linux not loongson2f
if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""}
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}

4
pkgs/development/compilers/gcc-4.6/default.nix
View File

@ -270,8 +270,8 @@ stdenv.mkDerivation ({
)
)
}
${ # Trick that should be taken out once we have a mips64-linux not loongson2f
if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""}
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}

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

@ -2,7 +2,7 @@
# I could not build it in armv5tel-linux or the fuloon2f
assert stdenv.system != "armv5tel-linux";
assert stdenv.system != "mips64-linux";
assert stdenv.system != "mips64el-linux";
stdenv.mkDerivation {
name = "libxcrypt-3.0.2";

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

@ -18,7 +18,7 @@ stdenv.mkDerivation {
};
patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional
(stdenv.system == "mips64-linux") ./mips_wmb.patch;
(stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs .";

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = "--disable-werror" # needed for dietlibc build
+ stdenv.lib.optionalString (stdenv.system == "mips64-linux")
+ stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
" --enable-fix-loongson2f-nop"
+ stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
+ stdenv.lib.optionalString gold " --enable-gold";

2
pkgs/lib/platforms.nix
View File

@ -3,7 +3,7 @@ let lists = import ./lists.nix; in
rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
"mips64-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"];

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# We get a warning in armv5tel-linux and the fuloong2f,
# so we disable -Werror in it
patchPhase = if (stdenv.system == "armv5tel-linux" ||
stdenv.system == "mips64-linux")
stdenv.system == "mips64el-linux")
then ''
sed -i s/-Werror// src/Makefile.am
'' else "";

2
pkgs/os-specific/linux/kernel-headers/2.6.28.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
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.system == "mips64-linux" then "mips" else
if stdenv.system == "mips64el-linux" then "mips" else
abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl];

4
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -46,7 +46,7 @@
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
|| stdenv.system == "armv5tel-linux" || stdenv.system == "mips64-linux";
|| stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux";
assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
@ -102,7 +102,7 @@ stdenv.mkDerivation {
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.system == "mips64-linux" then "mips" else
if stdenv.system == "mips64el-linux" then "mips" else
abort "Platform ${stdenv.system} is not supported.";
crossAttrs = let

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

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ flex ];
buildInputs = [ cracklib ]
++ stdenv.lib.optional
(stdenv.system != "armv5tel-linux" && stdenv.system != "mips64-linux")
(stdenv.system != "armv5tel-linux" && stdenv.system != "mips64el-linux")
libxcrypt;
crossAttrs = {

2
pkgs/stdenv/default.nix
View File

@ -55,7 +55,7 @@ rec {
if stdenvType == "i686-linux" then stdenvLinux else
if stdenvType == "x86_64-linux" then stdenvLinux else
if stdenvType == "armv5tel-linux" then stdenvLinux else
if stdenvType == "mips64-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
if stdenvType == "i686-darwin" then stdenvNix else

4
pkgs/stdenv/generic/default.nix
View File

@ -97,7 +97,7 @@ let
|| result.system == "x86_64-linux"
|| result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"
|| result.system == "mips64-linux";
|| result.system == "mips64el-linux";
isSunOS = result.system == "i686-solaris"
|| result.system == "x86_64-solaris";
isCygwin = result.system == "i686-cygwin";
@ -121,7 +121,7 @@ let
is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin";
isMips = result.system == "mips-linux"
|| result.system == "mips64-linux";
|| result.system == "mips64el-linux";
isArm = result.system == "armv5tel-linux";
# Utility function: allow stdenv to be easily regenerated with

4
pkgs/stdenv/linux/default.nix
View File

@ -14,7 +14,7 @@ rec {
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 == "mips64-linux" then import ./bootstrap/loongson2f
else if system == "mips64el-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
@ -23,7 +23,7 @@ rec {
export NIX_ENFORCE_PURITY=1
havePatchELF=1
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
${if system == "mips64-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
'';