diff options
| author | Xiyue Deng | 2012-10-26 09:35:11 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2012-10-26 09:35:14 +0100 |
| commit | 88cbd6a76b00ea14c8a5c2d06cd930f0e934c184 (patch) | |
| tree | 19d8de20d845c31e7445368304165b7877311755 /Library/Formula | |
| parent | 9982e8afa8fa9a6cbd3d128ddc943073d0f05237 (diff) | |
| download | homebrew-88cbd6a76b00ea14c8a5c2d06cd930f0e934c184.tar.bz2 | |
boost: a few tweaks.
* Fix typo in comment for adding rpath
* Enable detailed build log by adding "-d2" to bjam.
- This will show the actual compile commands during building.
* Tweak ICU handling
- Change icu4c_prefix to opt_prefix to avoid breakage when keg_only icu updates.
Closes #15506.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/boost.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb index 482be89ec..c863509ed 100644 --- a/Library/Formula/boost.rb +++ b/Library/Formula/boost.rb @@ -59,7 +59,7 @@ class Boost < Formula # /usr/local/bin/mkvmerge: # /usr/local/lib/libboost_regex-mt.dylib (compatibility version 0.0.0, current version 0.0.0) # /usr/local/lib/libboost_filesystem-mt.dylib (compatibility version 0.0.0, current version 0.0.0) - # /usr/local/libboost_system-mt.dylib (compatibility version 0.0.0, current version 0.0.0) + # /usr/local/lib/libboost_system-mt.dylib (compatibility version 0.0.0, current version 0.0.0) inreplace 'tools/build/v2/tools/darwin.jam', '-install_name "', "-install_name \"#{HOMEBREW_PREFIX}/lib/" # Force boost to compile using the appropriate GCC version @@ -71,13 +71,16 @@ class Boost < Formula # we specify libdir too because the script is apparently broken bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"] - if build.include? "with-icu" - icu4c_prefix = Formula.factory('icu4c').prefix + if build.include? 'with-icu' + icu4c_prefix = Formula.factory('icu4c').opt_prefix bargs << "--with-icu=#{icu4c_prefix}" + else + bargs << '--without-icu' end args = ["--prefix=#{prefix}", "--libdir=#{lib}", + "-d2", "-j#{ENV.make_jobs}", "--layout=tagged", "--user-config=user-config.jam", |