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

Merge pull request #4800 from aherrmann/pr_boost_mpi

Browse Source 
boost 1.55: Add Boost.MPI (optional)
This commit is contained in:
William A. Kennington III 2014-11-15 00:59:49 -08:00
commit 69bf3bd070
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/generic.nix
View File

@ -9,6 +9,7 @@
, enablePIC ? false , enablePIC ? false
, enableExceptions ? false , enableExceptions ? false
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
, mpi ? null
# Attributes inherit from specific versions # Attributes inherit from specific versions
, version, src , version, src
@ -64,7 +65,8 @@ let
nativeB2Flags = [ nativeB2Flags = [
"-sEXPAT_INCLUDE=${expat}/include" "-sEXPAT_INCLUDE=${expat}/include"
"-sEXPAT_LIBPATH=${expat}/lib" "-sEXPAT_LIBPATH=${expat}/lib"
] ++ optional (toolset != null) "toolset=${toolset}"; ] ++ optional (toolset != null) "toolset=${toolset}"
++ optional (mpi != null) "--user-config=user-config.jam";
nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
crossB2Flags = [ crossB2Flags = [
@ -128,6 +130,10 @@ stdenv.mkDerivation {
substituteInPlace tools/build/src/tools/clang-darwin.jam \ substituteInPlace tools/build/src/tools/clang-darwin.jam \
--replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; --replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)";
fi; fi;
'' + optionalString (mpi != null) ''
cat << EOF > user-config.jam
using mpi : ${mpi}/bin/mpiCC ;
EOF
''; '';
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin