boost: revert change to icu option
We can't rename options, it breaks upgrades.master
parent
3c5dfcbc24
commit
708d760639
|
@ -29,13 +29,13 @@ class Boost < Formula
|
||||||
|
|
||||||
option :universal
|
option :universal
|
||||||
option 'with-mpi', 'Enable MPI support'
|
option 'with-mpi', 'Enable MPI support'
|
||||||
option 'with-icu4c', 'Build regexp engine with icu support'
|
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 'with-c++11', 'Compile using Clang, std=c++11 and stdlib=libc++' if MacOS.version >= :lion
|
||||||
option 'use-system-layout', 'Use system layout instead of tagged'
|
option 'use-system-layout', 'Use system layout instead of tagged'
|
||||||
|
|
||||||
depends_on :python => :recommended
|
depends_on :python => :recommended
|
||||||
depends_on UniversalPython if build.universal? and build.with? "python"
|
depends_on UniversalPython if build.universal? and build.with? "python"
|
||||||
depends_on "icu4c" => :optional
|
depends_on "icu4c" if build.with? 'icu'
|
||||||
depends_on MPIDependency.new(:cc, :cxx) if build.with? "mpi"
|
depends_on MPIDependency.new(:cc, :cxx) if build.with? "mpi"
|
||||||
|
|
||||||
fails_with :llvm do
|
fails_with :llvm do
|
||||||
|
@ -77,7 +77,7 @@ class Boost < Formula
|
||||||
|
|
||||||
bargs << "--with-toolset=clang" if build.with? "c++11"
|
bargs << "--with-toolset=clang" if build.with? "c++11"
|
||||||
|
|
||||||
if build.with? 'icu4c'
|
if build.with? 'icu'
|
||||||
icu4c_prefix = Formula.factory('icu4c').opt_prefix
|
icu4c_prefix = Formula.factory('icu4c').opt_prefix
|
||||||
bargs << "--with-icu=#{icu4c_prefix}"
|
bargs << "--with-icu=#{icu4c_prefix}"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue