admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Extract name repair logic from fix_install_names

Browse Source
This commit is contained in:
Jack Nagel 2013-05-22 11:40:57 -05:00
parent 2488cfa55a
commit da2b5cf5ab
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Library/Homebrew/keg_fix_install_names.rb
View File

@ -7,23 +7,9 @@ class Keg
install_name_tool("-id", id, file) if file.dylib? install_name_tool("-id", id, file) if file.dylib?
bad_names.each do |bad_name| bad_names.each do |bad_name|
# If file is a dylib or bundle itself, look for the dylib named by new_name = fixed_name(file, bad_name)
# bad_name relative to the lib directory, so that we can skip the more unless new_name.nil?
# expensive recursive search if possible. install_name_tool("-change", bad_name, new_name, file)
if file.dylib? or file.mach_o_bundle? and (file.parent + bad_name).exist?
install_name_tool("-change", bad_name, "@loader_path/#{bad_name}", file)
elsif file.mach_o_executable? and (lib/bad_name).exist?
install_name_tool("-change", bad_name, "#{lib}/#{bad_name}", file)
else
# Otherwise, try and locate the dylib by walking the entire
# lib tree recursively.
abs_name = find_dylib(Pathname.new(bad_name).basename)
if abs_name and abs_name.exist?
install_name_tool("-change", bad_name, abs_name, file)
else
opoo "Could not fix install names for #{file}"
end
end end
end end
end end
@ -64,6 +50,21 @@ class Keg
system(MacOS.locate("install_name_tool"), *args) system(MacOS.locate("install_name_tool"), *args)
end end
# If file is a dylib or bundle itself, look for the dylib named by
# bad_name relative to the lib directory, so that we can skip the more
# expensive recursive search if possible.
def fixed_name(file, bad_name)
if (file.dylib? || file.mach_o_bundle?) && (file.parent + bad_name).exist?
"@loader_path/#{bad_name}"
elsif file.mach_o_executable? && (lib + bad_name).exist?
"#{lib}/#{bad_name}"
elsif (abs_name = find_dylib(Pathname.new(bad_name).basename)) && abs_name.exist?
abs_name.to_s
else
opoo "Could not fix install names for #{file}"
end
end
def lib; join 'lib' end def lib; join 'lib' end
def default_reject_proc def default_reject_proc