* Boost: cut the installed size from 257 MB (!!!) to 58 MB. It

required all that space because it was building static/shared,
  single-thread/multi-threaded, and debug/production versions of the
  libraries - as well as every combination of those.  Now we build
  only the shared, multi-threaded, production version, which needs
  only 8 MB.  The headers account for the other 50 MB, so it might be
  worthwhile to split them off into a separate package (in order to
  reduce the runtime closure of applications that use Boost, such as
  KDE).

* Removed some Boost versions that aren't used anymore.

svn path=/nixpkgs/trunk/; revision=14877

pkgs/development/libraries/boost/1.34.1.nix

@@ -1,17 +0,0 @@
-{stdenv, fetchurl, icu, zlib, bzip2, python, version}:
-
-assert version == "1.34.1";
-
-stdenv.mkDerivation {
-  name = "boost-1.34.1";
-  src = fetchurl {
-    url = mirror://sourceforge/boost/boost_1_34_1.tar.bz2;
-    sha256 = "0k7cjsgg3iqy49f9nnhyp945yry0bichd88p04sg3915n1snr1hg";
-  };
-  buildInputs = [icu zlib bzip2 python];
-  preConfigure="
-    sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system release threading=multi link=shared\"@g' -i configure
-  ";
-  patches = [./gcc-4.2.patch];
-  configureFlags="--with-icu=${icu}";
-}

pkgs/development/libraries/boost/1.35.0.nix

@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, icu, zlib, bzip2, python, version}:
-
-assert version == "1.35.0";
-
-stdenv.mkDerivation {
-  name = "boost-1.35.0";
-  meta = {
-    homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
-    license = "boost-license";
-  };
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_35_0.tar.bz2";
-    sha256 = "f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da";
-  };
-  buildInputs = [icu zlib bzip2 python];
-  preConfigure =
-    "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure";
-  configureFlags = "--with-icu=${icu} --with-python=${python}";
-}

pkgs/development/libraries/boost/1.36.0.nix

@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }:
+{stdenv, fetchurl, icu, expat, zlib, bzip2, python}:
-
-assert version == "1.36.0";
 
 stdenv.mkDerivation {
   name = "boost-1.36.0";
+  
   meta = {
     homepage = "http://boost.org/";
     description = "Boost C++ Library Collection";
     license = "boost-license";
   };
+  
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_36_0.tar.bz2";
     sha256 = "1vydzfvzg0fkzixkr2jikvcc0zbh5qgw98hr6nhj0z12ppxhqjls";
   };
+  
   buildInputs = [icu expat zlib bzip2 python];
-  preConfigure =
+
-    "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure";
+  preBuild = ''
+    makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=release threading=multi link=shared")
+  '';
+    
   configureFlags = "--with-icu=${icu} --with-python=${python}";
 }

pkgs/development/libraries/boost/1.37.0.nix

@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }:
-
-assert version == "1.37.0";
-
-stdenv.mkDerivation {
-  name = "boost-1.37.0";
-  meta = {
-    homepage = "http://boost.org/";
-    description = "Boost C++ Library Collection";
-    license = "boost-license";
-  };
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_37_0.tar.bz2";
-    sha256 = "0wjlmkp9klz6qfx02crw2w6py8k634m3l6hd9vfavfdif2gz8bnm";
-  };
-  buildInputs = [icu expat zlib bzip2 python];
-  preConfigure =
-    "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure";
-  configureFlags = "--with-icu=${icu} --with-python=${python}";
-}

pkgs/development/libraries/boost/1.38.0.nix

@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }:
+{stdenv, fetchurl, icu, expat, zlib, bzip2, python}:
-
-assert version == "1.38.0";
 
 stdenv.mkDerivation {
   name = "boost-1.38.0";
+  
   meta = {
     homepage = "http://boost.org/";
     description = "Boost C++ Library Collection";
     license = "boost-license";
   };
+  
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2";
     sha256 = "0rk044s4m7l4sma6anml34vxcd9w0fzcy1cy7csbzynjyida9qry";
   };
+  
   buildInputs = [icu expat zlib bzip2 python];
-  preConfigure =
+
-    "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure";
+  preBuild = ''
+    makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=release threading=multi link=shared")
+  '';
+    
   configureFlags = "--with-icu=${icu} --with-python=${python}";
 }

pkgs/development/libraries/boost/gcc-4.2.patch

@@ -1,11 +0,0 @@
-Index: trunk/tools/jam/src/build.jam
-===================================================================
---- trunk/tools/jam/src/build.jam (revision 40095)
-+++ trunk/tools/jam/src/build.jam (revision 41036)
-@@ -176,5 +176,5 @@
- ## GCC 2.x, 3.x, 4.x
- toolset gcc gcc : "-o " : -D
--    : -pedantic
-+    : -pedantic -fno-strict-aliasing
-     [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
-     [ opt --debug : -g -O0 -fno-inline ]

pkgs/top-level/all-packages.nix

@@ -2754,10 +2754,13 @@ let
     inherit fetchurl stdenv;
   };
 
-  boostVersionChoice = version: selectVersion ../development/libraries/boost version {
+  boost_1_36_0 = import ../development/libraries/boost/1.36.0.nix {
+    inherit fetchurl stdenv icu expat zlib bzip2 python;
+  };
+  
+  boost = import ../development/libraries/boost/1.38.0.nix {
     inherit fetchurl stdenv icu expat zlib bzip2 python;
   };
-  boost = boostVersionChoice "1.38.0";
 
   botan = builderDefsPackage (import ../development/libraries/botan) {
     inherit perl;
@@ -8543,7 +8546,7 @@ let
       db4 sablotron curl libsndfile flex zip unzip libmspack
       getopt file neon cairo which icu jdk ant hsqldb
       cups openssl bison;
-    boost = boostVersionChoice "1.36.0";
+    boost = boost_1_36_0;
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
   };