From 641f95658111036331693b1f77225e246e6b6316 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 1 Sep 2010 09:50:12 +0000 Subject: 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 svn path=/nixpkgs/branches/stdenv-updates/; revision=23588 --- pkgs/build-support/gcc-wrapper/default.nix | 2 +- pkgs/development/compilers/gcc-4.5/default.nix | 1 + pkgs/development/libraries/libxcrypt/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/development/tools/misc/binutils/snapshot.nix | 2 +- pkgs/lib/platforms.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 4 ++-- pkgs/os-specific/linux/pam/default.nix | 2 +- pkgs/stdenv/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 5 ++--- pkgs/stdenv/linux/default.nix | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 2c7ef16674b..56069ec17b3 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -67,7 +67,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 == "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 ""; } diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index c1e3d3a402a..9eadb68f63e 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -235,6 +235,7 @@ stdenv.mkDerivation ({ ) ) } + ${"--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 ""} diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index bc4272da3c8..aea9e53eef6 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -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"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1060ae8f738..9b449be1335 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { 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 ""); diff --git a/pkgs/development/tools/misc/binutils/snapshot.nix b/pkgs/development/tools/misc/binutils/snapshot.nix index 24b70dd2492..79f01cad4ef 100644 --- a/pkgs/development/tools/misc/binutils/snapshot.nix +++ b/pkgs/development/tools/misc/binutils/snapshot.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; 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}"; diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index 095281145d2..e9ed1e226e7 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -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" - "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"]; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 6120c1b8a0d..b1916e8aab1 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -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 == "ict_loongson-2_v0.3_fpu_v0.1-linux") + stdenv.system == "mips64-linux") then '' sed -i s/-Werror// src/Makefile.am '' else ""; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index f5dd09a2ccc..6972171b136 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -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 @@ 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 == "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 diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 0053d89b605..692643505e1 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { 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 = '' diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 940df3e224d..11af6d371cd 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -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 == "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 diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 7af6d2c0a55..c4d6a3666d0 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -97,7 +97,7 @@ let || 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 @@ let || 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"; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index f8be9c51bfa..af98fd98b74 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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 == "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 @@ rec { 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 ""} ''; -- cgit 1.4.1