Merge pull request #4800 from aherrmann/pr_boost_mpi

boost 1.55: Add Boost.MPI (optional)

+7 -1
+7 -1
pkgs/development/libraries/boost/generic.nix
··· 9 9 , enablePIC ? false 10 10 , enableExceptions ? false 11 11 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) 12 + , mpi ? null 12 13 13 14 # Attributes inherit from specific versions 14 15 , version, src ··· 64 65 nativeB2Flags = [ 65 66 "-sEXPAT_INCLUDE=${expat}/include" 66 67 "-sEXPAT_LIBPATH=${expat}/lib" 67 - ] ++ optional (toolset != null) "toolset=${toolset}"; 68 + ] ++ optional (toolset != null) "toolset=${toolset}" 69 + ++ optional (mpi != null) "--user-config=user-config.jam"; 68 70 nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); 69 71 70 72 crossB2Flags = [ ··· 128 130 substituteInPlace tools/build/src/tools/clang-darwin.jam \ 129 131 --replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; 130 132 fi; 133 + '' + optionalString (mpi != null) '' 134 + cat << EOF > user-config.jam 135 + using mpi : ${mpi}/bin/mpiCC ; 136 + EOF 131 137 ''; 132 138 133 139 NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin