Setting a snapshot of unreleased binutils for the fuloong2f

svn path=/nixpkgs/branches/stdenv-updates/; revision=23273

pkgs/development/tools/misc/binutils/snapshot.nix

@@ -0,0 +1,59 @@
+{stdenv, fetchurl, noSysDirs, cross ? null}:
+
+let
+    basename = "binutils-2.20.51";
+in
+stdenv.mkDerivation rec {
+  name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
+
+  src = fetchurl {
+    url = "file:///root/binutils/${basename}.tar.bz2";
+    sha256 = "1f0na8c31sccbipzk8xiyd7n7ydh5gg09kirbs28vcb2714cxws0";
+  };
+
+  patches = [
+    # Turn on --enable-new-dtags by default to make the linker set
+    # RUNPATH instead of RPATH on binaries.  This is important because
+    # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
+    ./new-dtags.patch
+  ];
+
+  inherit noSysDirs;
+
+  preConfigure = ''
+    # Clear the default library search path.
+    if test "$noSysDirs" = "1"; then
+	echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
+    fi
+
+    # Use symlinks instead of hard links to save space ("strip" in the
+    # fixup phase strips each hard link separately).
+    for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in; do
+        substituteInPlace $i --replace 'ln ' 'ln -s '
+    done
+  '';
+
+  configureFlags = "--disable-werror" # needed for dietlibc build
+      + stdenv.lib.optionalString (stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux")
+        " --enable-fix-loongson2f-nop"
+      + stdenv.lib.optionalString (cross != null) " --target=${cross.config}";
+
+  meta = {
+    description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
+
+    longDescription = ''
+      The GNU Binutils are a collection of binary tools.  The main
+      ones are `ld' (the GNU linker) and `as' (the GNU assembler).
+      They also include the BFD (Binary File Descriptor) library,
+      `gprof', `nm', `strip', etc.
+    '';
+
+    homepage = http://www.gnu.org/software/binutils/;
+
+    license = "GPLv3+";
+
+    /* Give binutils a lower priority than gcc-wrapper to prevent a
+       collision due to the ld/as wrappers/symlinks in the latter. */
+    priority = "10";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2260,10 +2260,17 @@ let
 
   avrdude = callPackage ../development/tools/misc/avrdude { };
 
-  binutils = callPackage ../development/tools/misc/binutils {
+  binutils_release = callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
   };
 
+  binutils_snapshot = callPackage ../development/tools/misc/binutils/snapshot.nix {
+    inherit noSysDirs;
+  };
+
+  binutils = if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then binutils_snapshot
+    else binutils_release;
+
   binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
       inherit stdenv fetchurl;
       noSysDirs = true;