* Streamline the stdenv bootstrap and resulting closure by removing

  some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
  Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.

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

8 files changed, 63 insertions, 147 deletions

diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 0e0029f9f94..a86c317e265 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -220,11 +220,6 @@ stdenv.mkDerivation ({
     ++ (optionals langVhdl [gnat])
     ;
 
-  configureFlagsArray = stdenv.lib.optionals
-    (ppl != null && ppl.dontDisableStatic == true)
-        [ "--with-host-libstdcxx=-lstdc++ -lgcc_s"
-            "--with-stage1-libs=-lstdc++ -lgcc_s" ];
-
   configureFlags = "
     ${if enableMultilib then "" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index d0e4083788b..d9dae7bfd41 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -1,15 +1,4 @@
-{ fetchurl, stdenv, ppl, static ? false }:
-
-let
-
-  # --with-host-libstdcxx helps when *ppl* is built statically.
-  # But I will suppose that this is statically built only when ppl is also
-  # statically built.
-  staticFlags =
-    assert static -> ppl.dontDisableStatic == true;
-    if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else "";
-    
-in
+{ fetchurl, stdenv, ppl }:
 
 stdenv.mkDerivation rec {
   name = "cloog-ppl-0.15.11";
@@ -21,11 +10,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ ppl ];
 
-  configureFlags = "--with-ppl=${ppl}" + staticFlags;
-  dontDisableStatic = if static then true else false;
+  configureFlags = "--with-ppl=${ppl}";
 
   crossAttrs = {
-    configureFlags = "--with-ppl=${ppl.hostDrv}" + staticFlags;
+    configureFlags = "--with-ppl=${ppl.hostDrv}";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 7bd0d68c3ec..ab5737b20ed 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -1,6 +1,4 @@
-{ fetchurl, stdenv, gmp, isl, static ? false }:
-
-assert static -> isl.dontDisableStatic;
+{ fetchurl, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
   name = "cloog-0.16.3";
@@ -14,10 +12,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ isl ];
 
-  configureFlags = [ "--with-isl=system" ]
-    ++ (stdenv.lib.optionals static [ "--enable-static" "--disable-shared" ]);
-
-  dontDisableStatic = static;
+  configureFlags = [ "--with-isl=system" ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix
index 1b079c05158..a633177c128 100644
--- a/pkgs/development/libraries/gmp/default.nix
+++ b/pkgs/development/libraries/gmp/default.nix
@@ -1,28 +1,19 @@
-{stdenv, fetchurl, m4, cxx ? true, static ? false}:
-
-let
-  staticFlags = stdenv.lib.optionals static
-                  [ "--enable-static" "--disable-shared" ];
-in
+{ stdenv, fetchurl, m4, cxx ? true }:
 
 stdenv.mkDerivation rec {
-  name = "gmp-5.0.1";
+  name = "gmp-5.0.2";
 
   src = fetchurl {
     url = "mirror://gnu/gmp/${name}.tar.bz2";
-    sha256 = "1yrr14l6vvhm1g27y8nb3c75j0i4ii4k1gw7ik08safk3zq119m2";
+    sha256 = "0a2ch2kpbzrsf3c1pfc6sph87hk2xmwa6np3sn2rzsflzmvdphnv";
   };
 
-  buildNativeInputs = [m4];
+  buildNativeInputs = [ m4 ];
 
   configureFlags =
     # Build a "fat binary", with routines for several sub-architectures (x86).
     [ "--enable-fat" ]
-
-    ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ])
-    ++ staticFlags;
-
-  dontDisableStatic = if static then true else false;
+    ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]);
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 65c0bc0c1d2..b080064d393 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, gmp, static ? false}:
+{ stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "isl-0.07";             # CLooG 0.16.3 fails to build with ISL 0.08.
+  name = "isl-0.07"; # CLooG 0.16.3 fails to build with ISL 0.08.
 
   src = fetchurl {
     url = "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2";
@@ -10,10 +10,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  dontDisableStatic = static;
-  configureFlags =
-    stdenv.lib.optionals static [ " --enable-static" "--disable-shared" ];
-
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = "LGPLv2.1";
diff --git a/pkgs/development/libraries/ppl/0.11.nix b/pkgs/development/libraries/ppl/0.11.nix
deleted file mode 100644
index d8ffde644de..00000000000
--- a/pkgs/development/libraries/ppl/0.11.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }:
-
-let
-  version = "0.11";
-  staticFlags = if static then " --enable-static --disable-shared --disable-watchdog" else "";
-in
-  stdenv.mkDerivation rec {
-    name = "ppl-${version}";
-
-    src = fetchurl {
-      url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz";
-      sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl";
-    };
-
-    buildNativeInputs = [ perl gnum4 ];
-    propagatedBuildInputs = [ gmpxx ];
-
-    dontDisableStatic = if static then true else false;
-    configureFlags = staticFlags;
-
-    # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
-    # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
-    # to be tested.
-    doCheck = false;
-
-    meta = {
-      description = "PPL: The Parma Polyhedra Library";
-
-      longDescription = ''
-        The Parma Polyhedra Library (PPL) provides numerical abstractions
-        especially targeted at applications in the field of analysis and
-        verification of complex systems.  These abstractions include convex
-        polyhedra, defined as the intersection of a finite number of (open or
-        closed) halfspaces, each described by a linear inequality (strict or
-        non-strict) with rational coefficients; some special classes of
-        polyhedra shapes that offer interesting complexity/precision tradeoffs;
-        and grids which represent regularly spaced points that satisfy a set of
-        linear congruence relations.  The library also supports finite
-        powersets and products of (any kind of) polyhedra and grids and a mixed
-        integer linear programming problem solver using an exact-arithmetic
-        version of the simplex algorithm.
-      '';
-
-      homepage = http://www.cs.unipr.it/ppl/;
-
-      license = "GPLv3+";
-
-      maintainers = [ stdenv.lib.maintainers.ludo ];
-    };
-  }
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index d8ffde644de..8cad9022d91 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,50 +1,49 @@
-{ fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }:
-
-let
-  version = "0.11";
-  staticFlags = if static then " --enable-static --disable-shared --disable-watchdog" else "";
-in
-  stdenv.mkDerivation rec {
-    name = "ppl-${version}";
-
-    src = fetchurl {
-      url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz";
-      sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl";
-    };
-
-    buildNativeInputs = [ perl gnum4 ];
-    propagatedBuildInputs = [ gmpxx ];
-
-    dontDisableStatic = if static then true else false;
-    configureFlags = staticFlags;
-
-    # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
-    # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
-    # to be tested.
-    doCheck = false;
-
-    meta = {
-      description = "PPL: The Parma Polyhedra Library";
-
-      longDescription = ''
-        The Parma Polyhedra Library (PPL) provides numerical abstractions
-        especially targeted at applications in the field of analysis and
-        verification of complex systems.  These abstractions include convex
-        polyhedra, defined as the intersection of a finite number of (open or
-        closed) halfspaces, each described by a linear inequality (strict or
-        non-strict) with rational coefficients; some special classes of
-        polyhedra shapes that offer interesting complexity/precision tradeoffs;
-        and grids which represent regularly spaced points that satisfy a set of
-        linear congruence relations.  The library also supports finite
-        powersets and products of (any kind of) polyhedra and grids and a mixed
-        integer linear programming problem solver using an exact-arithmetic
-        version of the simplex algorithm.
-      '';
-
-      homepage = http://www.cs.unipr.it/ppl/;
-
-      license = "GPLv3+";
-
-      maintainers = [ stdenv.lib.maintainers.ludo ];
-    };
-  }
+{ fetchurl, stdenv, gmpxx, perl, gnum4 }:
+
+let version = "0.11.2"; in
+
+stdenv.mkDerivation rec {
+  name = "ppl-${version}";
+
+  src = fetchurl {
+    url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
+    sha256 = "1sxviip4yk6gp453pid5scy1ba66dzdpr02i1416yk7lkv0x3yz3";
+  };
+
+  buildNativeInputs = [ perl gnum4 ];
+  propagatedBuildInputs = [ gmpxx ];
+
+  configureFlags = "--disable-watchdog";
+
+  # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
+  # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
+  # to be tested.
+  doCheck = false;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "PPL: The Parma Polyhedra Library";
+
+    longDescription = ''
+      The Parma Polyhedra Library (PPL) provides numerical abstractions
+      especially targeted at applications in the field of analysis and
+      verification of complex systems.  These abstractions include convex
+      polyhedra, defined as the intersection of a finite number of (open or
+      closed) halfspaces, each described by a linear inequality (strict or
+      non-strict) with rational coefficients; some special classes of
+      polyhedra shapes that offer interesting complexity/precision tradeoffs;
+      and grids which represent regularly spaced points that satisfy a set of
+      linear congruence relations.  The library also supports finite
+      powersets and products of (any kind of) polyhedra and grids and a mixed
+      integer linear programming problem solver using an exact-arithmetic
+      version of the simplex algorithm.
+    '';
+
+    homepage = http://www.cs.unipr.it/ppl/;
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e2e3c0f14cd..526bc45f8bc 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
       + stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
       + stdenv.lib.optionalString gold " --enable-gold";
 
+  enableParallelBuilding = true;
+      
   meta = {
     description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";