diff options
| author | Xiyue Deng | 2013-10-02 22:12:13 -0700 |
|---|---|---|
| committer | Xiyue Deng | 2013-10-04 02:03:03 -0700 |
| commit | 592b5d91a030f6925984cf19c3723ce7b601b576 (patch) | |
| tree | b90bc284c48d05cfa9a01cc1f5009fb88112ccab /Library/Homebrew/cmd | |
| parent | 535c02674ca9a3841b7a90c65350b23ac3c07da3 (diff) | |
| download | brew-592b5d91a030f6925984cf19c3723ce7b601b576.tar.bz2 | |
Fix install_name_tool path for keg_only formulae
* When a versioned keg_only formula installs the same set of executables
or libraries as a unversioned formula that links to $HOMEBREW_PREFIX,
install_name_tool will prefer to use the linked paths for files in
keg_only formula. This breaks software that should link to the
keg_only formula but links to the unversioned one instead.
* Add an additional "options" parameter with keg_only field to specify
the correct install path for keg_only formulae.
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 607c4802a..0fe7fb836 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -96,7 +96,7 @@ module Homebrew extend self keg.lock do # Relocate bottle library references before testing for built-in # references to the Cellar e.g. Qt's QMake annoyingly does this. - keg.relocate_install_names prefix, tmp_prefix, cellar, tmp_cellar + keg.relocate_install_names prefix, tmp_prefix, cellar, tmp_cellar, :keg_only => f.keg_only? if prefix == '/usr/local' prefix_check = HOMEBREW_PREFIX/'opt' |