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