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

keg: factor out dylib id calculation

Browse Source
This commit is contained in:
Jack Nagel 2013-12-14 09:35:57 -06:00
parent 7a10493387
commit f4618f0147
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/keg_fix_install_names.rb
View File

@ -127,23 +127,26 @@ class Keg
install_names.shift # first line is fluff install_names.shift # first line is fluff
install_names.map!{ |s| OTOOL_RX =~ s && $1 } install_names.map!{ |s| OTOOL_RX =~ s && $1 }
# Bundles and executables do not have an ID # For dylibs, the next line is the ID
id = install_names.shift if file.dylib? install_names.shift if file.dylib?
install_names.compact! install_names.compact!
install_names.reject!{ |fn| fn =~ /^@(loader_|executable_|r)path/ } install_names.reject!{ |fn| fn =~ /^@(loader_|executable_|r)path/ }
install_names.reject!{ |fn| reject_proc.call(fn) } install_names.reject!{ |fn| reject_proc.call(fn) }
yield dylib_id_for(file, options), install_names
end
def dylib_id_for file, options={}
# the shortpath ensures that library upgrades don’t break installed tools # the shortpath ensures that library upgrades don’t break installed tools
relative_path = Pathname.new(file).relative_path_from(self) relative_path = Pathname.new(file).relative_path_from(self)
shortpath = HOMEBREW_PREFIX.join(relative_path) shortpath = HOMEBREW_PREFIX.join(relative_path)
id = if shortpath.exist? and not options[:keg_only]
if shortpath.exist? and not options[:keg_only]
shortpath shortpath
else else
"#{HOMEBREW_PREFIX}/opt/#{fname}/#{relative_path}" "#{HOMEBREW_PREFIX}/opt/#{fname}/#{relative_path}"
end end
yield id, install_names
end end
def find_dylib name def find_dylib name