Author: viric
Date: Wed Sep 1 09:50:12 2010
New Revision: 23588
URL: https://svn.nixos.org/websvn/nix/?rev=23588&sc=1
Log:
Setting any stdenv.system references for the loongson2f system to
'mips64-linux'.
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates
Conflicts:
pkgs/applications/networking/browsers/firefox/3.6.nix
pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pam/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/default.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/default.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -67,7 +67,7 @@
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 == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "ld.so.1"
else
+ if stdenv.system == "mips64-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
else "";
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -235,6 +235,7 @@
)
)
}
+ ${"--with-arch=loongson2f"}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxcrypt/default.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -2,7 +2,7 @@
# I could not build it in armv5tel-linux or the fuloon2f
assert stdenv.system != "armv5tel-linux";
-assert stdenv.system != "ict_loongson-2_v0.3_fpu_v0.1-linux";
+assert stdenv.system != "mips64-linux";
stdenv.mkDerivation {
name = "libxcrypt-3.0.2";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -14,7 +14,7 @@
configureFlags =
"--disable-gallium"
- + (if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then
+ + (if stdenv.system == "mips64-linux" then
" --with-dri-drivers=swrast --with-driver=dri" else "")
+ (if stdenv.isDarwin then " --disable-egl" else "");
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -34,7 +34,7 @@
'';
configureFlags = "--disable-werror" # needed for dietlibc build
- + stdenv.lib.optionalString (stdenv.system ==
"ict_loongson-2_v0.3_fpu_v0.1-linux")
+ + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
" --enable-fix-loongson2f-nop"
+ stdenv.lib.optionalString (cross != null) " --target=${cross.config}";
Modified: nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix Wed Sep 1
09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix Wed Sep 1
09:50:12 2010 (r23588)
@@ -3,7 +3,7 @@
rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
- "ict_loongson-2_v0.3_fpu_v0.1-linux"];
+ "mips64-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/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -13,7 +13,7 @@
# We get a warning in armv5tel-linux and the fuloong2f,
# so we disable -Werror in it
patchPhase = if (stdenv.system == "armv5tel-linux" ||
- stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux")
+ stdenv.system == "mips64-linux")
then ''
sed -i s/-Werror// src/Makefile.am
'' else "";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -42,7 +42,7 @@
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
- || stdenv.system == "armv5tel-linux" || stdenv.system ==
"ict_loongson-2_v0.3_fpu_v0.1-linux";
+ || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64-linux";
assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
@@ -99,7 +99,7 @@
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 == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "mips" else
+ if stdenv.system == "mips64-linux" then "mips" else
abort "Platform ${stdenv.system} is not supported.";
crossAttrs = let
Modified: nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pam/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pam/default.nix
Wed Sep 1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pam/default.nix
Wed Sep 1 09:50:12 2010 (r23588)
@@ -10,7 +10,7 @@
buildInputs = [ flex cracklib ]
++ stdenv.lib.optional
- (stdenv.system != "armv5tel-linux" && stdenv.system !=
"ict_loongson-2_v0.3_fpu_v0.1-linux")
+ (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64-linux")
libxcrypt;
postInstall = ''
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/default.nix Wed Sep 1
09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/default.nix Wed Sep 1
09:50:12 2010 (r23588)
@@ -55,7 +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 == "ict_loongson-2_v0.3_fpu_v0.1-linux" then stdenvLinux else
+ if stdenvType == "mips64-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
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix Wed Sep
1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix Wed Sep
1 09:50:12 2010 (r23588)
@@ -97,7 +97,7 @@
|| result.system == "x86_64-linux"
|| result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"
- || result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux";
+ || result.system == "mips64-linux";
isSunOS = result.system == "i386-sunos";
isCygwin = result.system == "i686-cygwin";
isFreeBSD = result.system == "i686-freebsd"
@@ -119,8 +119,7 @@
|| result.system == "x86_64-openbsd";
is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin";
- isMips = result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux"
- || result.system == "mips-linux"
+ isMips = result.system == "mips-linux"
|| result.system == "mips64-linux";
isArm = result.system == "armv5tel-linux";
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Wed Sep
1 09:49:53 2010 (r23587)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Wed Sep
1 09:50:12 2010 (r23588)
@@ -14,7 +14,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 == "ict_loongson-2_v0.3_fpu_v0.1-linux" then import
./bootstrap/loongson2f
+ else if system == "mips64-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
@@ -23,7 +23,7 @@
export NIX_ENFORCE_PURITY=1
havePatchELF=1
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
- ${if system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then
"NIX_LIB32_IN_SELF_RPATH=1" else ""}
+ ${if system == "mips64-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
