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

boost-1.44: add 'taggedLayout' parameter to force use of tagged layout in single-variant builds

Browse Source
This commit is contained in:
Peter Simons 2012-07-07 11:57:01 +02:00
parent 5b4d0bb383
commit eb7ad413b8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/boost/1.44.nix
View File

@ -6,6 +6,7 @@
, enableShared ? true , enableShared ? true
, enableStatic ? false , enableStatic ? false
, enablePIC ? false , enablePIC ? false
, taggedLayout ? false
}: }:
let let
@ -23,7 +24,7 @@ let
stdenv.lib.optional enableStatic "static"); stdenv.lib.optional enableStatic "static");
# To avoid library name collisions # To avoid library name collisions
finalLayout = if ((enableRelease && enableDebug) || finalLayout = if (taggedLayout || (enableRelease && enableDebug) ||
(enableSingleThreaded && enableMultiThreaded) || (enableSingleThreaded && enableMultiThreaded) ||
(enableShared && enableStatic)) then (enableShared && enableStatic)) then
"tagged" else "system"; "tagged" else "system";
@ -63,12 +64,12 @@ stdenv.mkDerivation {
# Patch to get rid of following error, experienced by some packages like encfs, bitcoin: # Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
# terminate called after throwing an instance of 'std::runtime_error' # terminate called after throwing an instance of 'std::runtime_error'
# what(): locale::facet::_S_create_c_locale name not valid # what(): locale::facet::_S_create_c_locale name not valid
(fetchurl { (fetchurl {
url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ; url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d";
}) })
]; ];
crossAttrs = rec { crossAttrs = rec {
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to