Fixing boostFull 1.40.0

They removed the usual tagged library names in 1.40 under the layout
"system", but they introduced a new layout "tagged". The "tagged" layout
is needed when we want more than one 'style' of the libraries at once(debug,release, ...

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

pkgs/development/libraries/boost/1.40.0.nix

@@ -21,6 +21,12 @@ let
     (stdenv.lib.optional enableShared "shared" ++
      stdenv.lib.optional enableStatic "static");
 
+  # To avoid library name collisions
+  finalLayout = if ((enableRelease && enableDebug) ||
+    (enableSingleThreaded && enableMultiThreaded) ||
+    (enableShared && enableStatic)) then
+    "system" else "tagged";
+
 in
 
 stdenv.mkDerivation {
@@ -42,7 +48,7 @@ stdenv.mkDerivation {
   configureScript = "./bootstrap.sh";
   configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
 
-  buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=${variant} threading=${threading} link=${link} install";
+  buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} install";
 
   installPhase = ":";
 }