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 Homebrew/homebrew#15506.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
master
Xiyue Deng 2012-10-26 09:35:11 +01:00 committed by Mike McQuaid
parent dc3ee6937b
commit 0bae0c0099
1 changed files with 6 additions and 3 deletions

View File

@ -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",