wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

boost@1.55: remove mpi option

Browse source
This commit is contained in:
FX Coudert 2018-01-13 17:19:57 +01:00
parent 4002e930e2
commit ef7bb08b12
1 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Formula/boost@1.55.rb
View file

@ -43,7 +43,6 @@ class BoostAT155 < Formula
option "with-icu", "Build regexp engine with icu support"
option "without-single", "Disable building single-threading variant"
option "without-static", "Disable building static library variant"
option "with-mpi", "Build with MPI support"
option :cxx11
depends_on "python" => :optional
@ -61,14 +60,6 @@ class BoostAT155 < Formula
end
end
if build.with? "mpi"
if build.cxx11?
depends_on "open-mpi" => "c++11"
else
depends_on :mpi => [:cc, :cxx, :optional]
end
end
def install
# Patch boost::serialization for Clang
# https://svn.boost.org/trac/boost/raw-attachment/ticket/8757/0005-Boost.S11n-include-missing-algorithm.patch
@ -76,28 +67,9 @@ class BoostAT155 < Formula
"#include <boost/iterator/iterator_traits.hpp>",
"#include <boost/iterator/iterator_traits.hpp>\n#include <algorithm>"
# https://svn.boost.org/trac/boost/ticket/8841
if build.with?("mpi") && build.with?("single")
raise <<~EOS
Building MPI support for both single and multi-threaded flavors
is not supported. Please use "--with-mpi" together with
"--without-single".
EOS
end
if build.cxx11? && build.with?("mpi") && (build.with?("python") \
|| build.with?("python3"))
raise <<~EOS
Building MPI support for Python using C++11 mode results in
failure and hence disabled. Please don"t use this combination
of options.
EOS
end
# Force boost to compile using the appropriate GCC version.
open("user-config.jam", "a") do |file|
file.write "using darwin : : #{ENV.cxx} ;\n"
file.write "using mpi ;\n" if build.with? "mpi"
# Link against correct version of Python if python3 build was requested
if build.with? "python3"
@ -125,14 +97,13 @@ class BoostAT155 < Formula
end
# Handle libraries that will not be built.
without_libraries = []
without_libraries = ["mpi"]
# Boost.Log cannot be built using Apple GCC at the moment. Disabled
# on such systems.
without_libraries << "log" if ENV.compiler == :gcc
without_libraries << "python" if build.without?("python") \
&& build.without?("python3")
without_libraries << "mpi" if build.without? "mpi"
bargs << "--without-libraries=#{without_libraries.join(",")}"