From adaf6c49257867e5fa071404852bca535ded8034 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Wed, 12 Nov 2014 17:15:01 -0800 Subject: open-mpi 1.8.3: Rename --disable-* to --without-* Rename --disable-fortran to --without-fortran Rename --enable-mpi-thread-multiple to --with-mpi-thread-multiple Closes #34142. Signed-off-by: Jack Nagel --- Library/Formula/open-mpi.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/open-mpi.rb b/Library/Formula/open-mpi.rb index 9b9fb1219..104b61024 100644 --- a/Library/Formula/open-mpi.rb +++ b/Library/Formula/open-mpi.rb @@ -12,14 +12,16 @@ class OpenMpi < Formula sha1 "4bd58e35a701b7b9bca3092d852b746e5975a866" => :mountain_lion end - option 'disable-fortran', 'Do not build the Fortran bindings' - option 'enable-mpi-thread-multiple', 'Enable MPI_THREAD_MULTIPLE' + deprecated_option "disable-fortran" => "without-fortran" + deprecated_option "enable-mpi-thread-multiple" => "with-mpi-thread-multiple" + + option "with-mpi-thread-multiple", "Enable MPI_THREAD_MULTIPLE" option :cxx11 conflicts_with 'mpich2', :because => 'both install mpi__ compiler wrappers' conflicts_with 'lcdf-typetools', :because => 'both install same set of binaries.' - depends_on :fortran unless build.include? 'disable-fortran' + depends_on :fortran => :recommended depends_on 'libevent' def install @@ -32,11 +34,8 @@ class OpenMpi < Formula --enable-ipv6 --with-libevent=#{Formula["libevent"].opt_prefix} ] - args << "--disable-mpi-fortran" if build.include? "disable-fortran" - - if build.include? 'enable-mpi-thread-multiple' - args << '--enable-mpi-thread-multiple' - end + args << "--disable-mpi-fortran" if build.without? "fortran" + args << "--enable-mpi-thread-multiple" if build.with? "mpi-thread-multiple" system './configure', *args system 'make', 'all' -- cgit v1.2.3