public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing boostFull 1.40.0

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2009-10-02 07:39:11 +00:00
parent c66b4ee26d
commit 924d48083b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/boost/1.40.0.nix
View File

@ -21,6 +21,12 @@ let
(stdenv.lib.optional enableShared "shared" ++ (stdenv.lib.optional enableShared "shared" ++
stdenv.lib.optional enableStatic "static"); stdenv.lib.optional enableStatic "static");
# To avoid library name collisions
finalLayout = if ((enableRelease && enableDebug) ||
(enableSingleThreaded && enableMultiThreaded) ||
(enableShared && enableStatic)) then
"system" else "tagged";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -42,7 +48,7 @@ stdenv.mkDerivation {
configureScript = "./bootstrap.sh"; configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; 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 = ":"; installPhase = ":";
} }