install : update boost.rb

packaging/os_x/boost.rb

@@ -14,64 +14,75 @@ end
 
 class Boost < Formula
   homepage 'http://www.boost.org'
-  url 'http://downloads.sourceforge.net/project/boost/boost/1.54.0/boost_1_54_0.tar.bz2'
+  url 'http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2'
-  sha1 '230782c7219882d0fab5f1effbe86edb85238bf4'
+  sha1 'cef9a0cc7084b1d639e06cd3bc34e4251524c840'
 
   head 'http://svn.boost.org/svn/boost/trunk'
 
   bottle do
     cellar :any
-    sha1 '767a67f4400e5273db3443e10a6e07704b4cbd0f' => :mountain_lion
+    revision 1
-    sha1 '5f487b4a1d131722dd673d7ee2de418adf3b5322' => :lion
+    sha1 'e715bed5765c5a89fd2c7f2938bf4db405a11fbc' => :mavericks
-    sha1 'cedd9bd34e6dbebc073beeb12fb3aa7a3cb5ecb6' => :snow_leopard
+    sha1 '099a7374e95690e2268f7abbd4ccfb0559541b73' => :mountain_lion
+    sha1 '1961f75f2139f3f0998aae03a1be8e9ac553d292' => :lion
   end
 
   env :userpaths
 
   option :universal
   option 'with-icu', 'Build regexp engine with icu support'
-  option 'with-c++11', 'Compile using Clang, std=c++11 and stdlib=libc++' if MacOS.version >= :lion
   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 => :recommended
   depends_on UniversalPython if build.universal? and build.with? "python"
-  depends_on "icu4c" if build.with? 'icu'
+
-  depends_on :mpi => [:cc, :cxx, :optional]
+  if build.with? 'icu'
+    if build.cxx11?
+      depends_on 'icu4c' => 'c++11'
+    else
+      depends_on 'icu4c'
+    end
+  end
+
+  if build.with? 'mpi'
+    if build.cxx11?
+      depends_on 'open-mpi' => 'c++11'
+    else
+      depends_on :mpi => [:cc, :cxx, :optional]
+    end
+  end
+
+  odie 'boost: --with-c++11 has been renamed to --c++11' if build.with? 'c++11'
 
   fails_with :llvm do
     build 2335
     cause "Dropped arguments to functions when linking with boost"
   end
 
-  def patches
-    # upstream backported patches for 1.54.0: http://www.boost.org/patches
-    [
-      'http://www.boost.org/patches/1_54_0/001-coroutine.patch',
-      'http://www.boost.org/patches/1_54_0/002-date-time.patch',
-      'http://www.boost.org/patches/1_54_0/003-log.patch',
-      'http://www.boost.org/patches/1_54_0/004-thread.patch',
-      'http://ipht.cea.fr/triqs/boost_1_54_0_mpi_python.patch'
-    ] unless build.head?
-  end
-
-  def pour_bottle?
-    # Don't use the bottle if there is a Homebrew python installed as users
-    # will probably want to link against that instead.
-    not Formula.factory('python').installed?
-  end
-
   def install
     # https://svn.boost.org/trac/boost/ticket/8841
-    if build.with? 'mpi' and !build.without? 'single'
+    if build.with? 'mpi' and not build.without? 'single'
-      onoe <<-EOS.undent
+      raise <<-EOS.undent
         Building MPI support for both single and multi-threaded flavors
         is not supported.  Please use '--with-mpi' together with
-        '--disable-single'.
+        '--without-single'.
       EOS
-      exit -1
     end
 
+    #if build.cxx11? and build.with? 'mpi' and python
+    #  raise <<-EOS.undent
+    #    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
+
+    ENV.universal_binary if build.universal?
+    ENV.cxx11 if build.cxx11?
+
     # Adjust the name the libs are installed under to include the path to the
     # Homebrew lib directory so executables will work when installed to a
     # non-/usr/local location.
@@ -103,8 +114,6 @@ class Boost < Formula
     # we specify libdir too because the script is apparently broken
     bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"]
 
-    bargs << "--with-toolset=clang" if build.with? "c++11"
-
     if build.with? 'icu'
       icu4c_prefix = Formula.factory('icu4c').opt_prefix
       bargs << "--with-icu=#{icu4c_prefix}"
@@ -112,18 +121,26 @@ class Boost < Formula
       bargs << '--without-icu'
     end
 
+    # Handle libraries that will not be built.
+    without_libraries = []
+
     # The context library is implemented as x86_64 ASM, so it
     # won't build on PPC or 32-bit builds
-    # see https://github.com/mxcl/homebrew/issues/17646
+    # see https://github.com/Homebrew/homebrew/issues/17646
-    if Hardware::CPU.type == :ppc || Hardware::CPU.bits == 32 || build.universal?
+    if Hardware::CPU.ppc? || Hardware::CPU.is_32_bit? || build.universal?
-      bargs << "--without-libraries=context"
+      without_libraries << "context"
       # The coroutine library depends on the context library.
-      bargs << "--without-libraries=coroutine"
+      without_libraries << "coroutine"
     end
 
     # Boost.Log cannot be built using Apple GCC at the moment. Disabled
     # on such systems.
-    bargs << "--without-libraries=log" if MacOS.version <= :snow_leopard
+    without_libraries << "log" if ENV.compiler == :gcc || ENV.compiler == :llvm
+
+    without_libraries << "python" if build.without? 'python'
+    without_libraries << "mpi" if build.without? 'mpi'
+
+    bargs << "--without-libraries=#{without_libraries.join(',')}"
 
     args = ["--prefix=#{prefix}",
             "--libdir=#{lib}",
@@ -145,31 +162,51 @@ class Boost < Formula
       args << "link=shared,static"
     end
 
-    if MacOS.version >= :lion and build.with? 'c++11'
-      args << "toolset=clang" << "cxxflags=-std=c++11"
-      args << "cxxflags=-stdlib=libc++" << "cxxflags=-fPIC"
-      args << "cxxflags=-arch #{Hardware::CPU.arch_64_bit}" if MacOS.prefer_64_bit? or build.universal?
-      args << "cxxflags=-arch #{Hardware::CPU.arch_32_bit}" if !MacOS.prefer_64_bit? or build.universal?
-      args << "linkflags=-stdlib=libc++"
-      args << "linkflags=-arch #{Hardware::CPU.arch_64_bit}" if MacOS.prefer_64_bit? or build.universal?
-      args << "linkflags=-arch #{Hardware::CPU.arch_32_bit}" if !MacOS.prefer_64_bit? or build.universal?
-    end
-
     args << "address-model=32_64" << "architecture=x86" << "pch=off" if build.universal?
-    args << "--without-python" if build.without? 'python'
 
     system "./bootstrap.sh", *bargs
     system "./b2", *args
-  
+
-    # Need to move the mpi.so at the right place and add the __init__.py file that boost does do itself... 
+    # Need to move the mpi.so at the right place and add the __init__.py file that boost does do itself...
-    if build.with? 'mpi' and !build.without? 'python' 
+    # TODO: generalize /usr/local by taking the first part of prefix
+    if build.with? 'mpi' and !build.without? 'python'
      python_dir = `/usr/local/bin/python -c "from distutils.sysconfig import * ;import sys; sys.stdout.write (get_python_lib(0,0))"` + "/boost"
      system "mkdir -p "+ python_dir
-     system "cd %s && mv -f /usr/local/Cellar/boost/1.54.0/lib/mpi.so . && rm -f /usr/local/lib/mpi.so"% python_dir
+     system "cd %s && mv -f #{lib}/mpi.so . && rm -f /usr/local/lib/mpi.so"% python_dir
      open(python_dir + "/__init__.py", "w") do |file|
-      file.write "import mpi \n" 
+      file.write "import mpi \n"
      end
     end
 
   end
+
+  def caveats
+    s = ''
+    # ENV.compiler doesn't exist in caveats. Check library availability
+    # instead.
+    if Dir.glob("#{lib}/libboost_log*").empty?
+      s += <<-EOS.undent
+
+      Building of Boost.Log is disabled because it requires newer GCC or Clang.
+      EOS
+    end
+
+    if Hardware::CPU.ppc? || Hardware::CPU.is_32_bit? || build.universal?
+      s += <<-EOS.undent
+
+      Building of Boost.Context and Boost.Coroutine is disabled as they are
+      only supported on x86_64.
+      EOS
+    end
+
+    if pour_bottle? and Formula.factory('python').installed?
+      s += <<-EOS.undent
+
+      The Boost bottle's module will not import into a Homebrew-installed Python.
+      If you use the Boost Python module then please:
+        brew install boost --build-from-source
+      EOS
+    end
+    s
+  end
 end