diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-02 07:39:11 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-02 07:39:11 +0000 |
| commit | 924d48083b8dde4225028b14dd2409d287ff8b47 (patch) | |
| tree | c53008bc3cdc735b93c5dad49250b1356e227705 /pkgs/development/libraries/boost | |
| parent | c66b4ee26d7da34bbc636197c32d2e377716b4ec (diff) | |
| download | nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.tar nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.tar.gz nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.tar.bz2 nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.tar.lz nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.tar.xz nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.tar.zst nixlib-924d48083b8dde4225028b14dd2409d287ff8b47.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/1.40.0.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/1.40.0.nix b/pkgs/development/libraries/boost/1.40.0.nix index 0ae1470178c6..e67af56a3624 100644 --- a/pkgs/development/libraries/boost/1.40.0.nix +++ b/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 = ":"; } |