Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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>
  • Loading branch information...
commit 88cbd6a76b00ea14c8a5c2d06cd930f0e934c184 1 parent 9982e8a
@manphiz manphiz authored mikemcquaid committed
Showing with 6 additions and 3 deletions.
  1. +6 −3 Library/Formula/boost.rb
View
9 Library/Formula/boost.rb
@@ -59,7 +59,7 @@ def install
# /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 @@ def install
# 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",
Please sign in to comment.
Something went wrong with that request. Please try again.