Skip to content

Commit

Permalink
Use boost-python instead of boost => with-python
Browse files Browse the repository at this point in the history
Boost.Python support in Homebrew is moving from the boost formula to a
new boost-python formula. This commit updates formulas that were using
boost --with-python to use boost-python instead.

This should not be committed to master until Homebrew/legacy-homebrew#30957 is
accepted.

Closes #1080.
  • Loading branch information
tdsmith committed Sep 19, 2014
1 parent 7b42138 commit 410d5dc
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
4 changes: 3 additions & 1 deletion gal-sim.rb
Expand Up @@ -5,10 +5,12 @@ class GalSim < Formula
url "https://github.com/GalSim-developers/GalSim/archive/v1.1.0.tar.gz"
sha1 'a1446f73053b4dc91f62d236193ba6ccb1fb9ae5'
head "https://github.com/GalSim-developers/GalSim.git"
revision 1

depends_on "scons" => :build
depends_on "fftw"
depends_on "boost" => 'with-python'
depends_on "boost"
depends_on "boost-python"
depends_on "tmv-cpp"

# pyfits should come from pip
Expand Down
6 changes: 4 additions & 2 deletions graph-tool.rb
Expand Up @@ -5,6 +5,7 @@ class GraphTool < Formula
url 'http://downloads.skewed.de/graph-tool/graph-tool-2.2.31.tar.bz2'
sha1 '5e0b1c215ecd76191a82c745df0fac17e33bfb09'
head 'https://github.com/count0/graph-tool.git'
revision 1

option 'without-cairo', 'Build without cairo support'

Expand All @@ -15,15 +16,16 @@ class GraphTool < Formula
depends_on 'cgal' => 'c++11'
depends_on 'google-sparsehash' => ['c++11', :recommended]
depends_on 'cairomm' => 'c++11' if build.with? 'cairo'
depends_on 'boost' => 'c++11'

if build.with? "python3"
depends_on "boost" => ["c++11", "with-python3"]
depends_on "boost-python" => ["c++11", "with-python3"]
depends_on "py3cairo" if build.with? "cairo"
depends_on "matplotlib" => :python3
depends_on "numpy" => :python3
depends_on "scipy" => :python3
elsif build.with? "python"
depends_on "boost" => ["c++11", "with-python"]
depends_on "boost-python" => ["c++11", "with-python"]
depends_on "py2cairo" if build.with? "cairo"
depends_on "matplotlib" => :python
depends_on "numpy" => :python
Expand Down
3 changes: 2 additions & 1 deletion madlib.rb
Expand Up @@ -4,13 +4,14 @@ class Madlib < Formula
homepage "http://madlib.net"
url "https://github.com/madlib/madlib/archive/v1.6.0.tar.gz"
sha1 "c19867f71f85d6dcb83b4600a811530a9344cc35"
revision 1

head "https://github.com/madlib/madlib.git", :branch => "master"

boost_opts = []
boost_opts << "with-python" if build.with? :python
boost_opts << "c++11" if MacOS.version < :mavericks
depends_on "boost" => boost_opts
depends_on "boost-python" => boost_opts if build.with? "python"
depends_on "cmake" => :build
depends_on "postgresql" => ['with-python']
depends_on :python => :optional
Expand Down
4 changes: 3 additions & 1 deletion openimageio.rb
Expand Up @@ -4,6 +4,7 @@ class Openimageio < Formula
homepage 'http://openimageio.org'
url 'https://github.com/OpenImageIO/oiio/archive/Release-1.4.8.tar.gz'
sha1 '412793b71ba5510709795a47395a78436a4c5344'
revision 1

head 'https://github.com/OpenImageIO/oiio.git'

Expand All @@ -14,7 +15,8 @@ class Openimageio < Formula
depends_on 'opencolorio'
depends_on 'ilmbase'
depends_on 'openexr'
depends_on 'boost' => 'with-python'
depends_on 'boost'
depends_on 'boost-python'
depends_on 'libtiff'
depends_on 'jpeg'
depends_on 'openjpeg'
Expand Down
4 changes: 3 additions & 1 deletion pykep.rb
Expand Up @@ -5,9 +5,11 @@ class Pykep < Formula
url "https://github.com/esa/pykep/archive/1.1.3.tar.gz"
sha1 "15603482ff38221e874a59c11d4d1a575ee3801f"
head "https://github.com/esa/pykep.git"
revision 1

depends_on "cmake" => :build
depends_on "boost" => "with-python"
depends_on "boost"
depends_on "boost-python"
depends_on :python

def install
Expand Down
9 changes: 6 additions & 3 deletions vigra.rb
Expand Up @@ -5,6 +5,7 @@ class Vigra < Formula
url 'https://github.com/ukoethe/vigra/releases/download/Version-1-10-0/vigra-1.10.0-src-with-docu.tar.gz'
sha1 '0a882bc09f5a6ec1f8381ff571020259eb88ee67'
head 'https://github.com/ukoethe/vigra.git'
revision 1

option :cxx11
option "without-check", "skip tests"
Expand All @@ -22,9 +23,11 @@ class Vigra < Formula
# vigra python bindings requires boost-python
# see http://packages.ubuntu.com/saucy/python-vigra
if build.with? "python"
boostwith = ["with-python"]
boostwith << "c++11" if build.cxx11?
depends_on "boost" => boostwith
if build.cxx11?
depends_on "boost-python" => "c++11"
else
depends_on "boost-python"
end
end

def install
Expand Down

0 comments on commit 410d5dc

Please sign in to comment.