From e32e2475bb358f3db90383570d794b8cdc7145fa Mon Sep 17 00:00:00 2001 From: Camillo Lugaresi Date: Fri, 17 Feb 2012 19:19:08 -0600 Subject: [PATCH] Make fix_install_names more robust fixes a problem with the opencv formula Closes Homebrew/homebrew#10291. Signed-off-by: Jack Nagel --- Library/Homebrew/keg_fix_install_names.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb index d3117b6f3f..e0b9259c45 100644 --- a/Library/Homebrew/keg_fix_install_names.rb +++ b/Library/Homebrew/keg_fix_install_names.rb @@ -5,8 +5,15 @@ class Keg dylib.ensure_writable do system "install_name_tool", "-id", id, dylib bad_names.each do |bad_name| - # we should be more careful here, check the path we point to exists etc. - system "install_name_tool", "-change", bad_name, "@loader_path/#{bad_name}", dylib + new_name = bad_name + new_name = Pathname.new(bad_name).basename unless (dylib.parent + new_name).exist? + # this fixes some problems, maybe not all. opencv seems to have badnames of the type + # "lib/libblah.dylib" + if (dylib.parent + new_name).exist? + system "install_name_tool", "-change", bad_name, "@loader_path/#{new_name}", dylib + else + opoo "Could not fix install names for #{dylib}" + end end end end