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

Revert "keg_relocate: Don't relocate dylib IDs containing metavariables."

Browse Source
This commit is contained in:
Mike McQuaid 2017-04-04 13:29:27 +01:00 committed by GitHub
parent 2ba53eb272
commit 715132642f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/extend/os/mac/keg_relocate.rb
View File

@ -78,19 +78,13 @@ class Keg
end end
end end
def filename_contains_metavariable?(fn)
fn =~ /^@(loader_|executable_|r)path/
end
def each_install_name_for(file, &block) def each_install_name_for(file, &block)
dylibs = file.dynamically_linked_libraries dylibs = file.dynamically_linked_libraries
dylibs.reject! { |fn| filename_contains_metavariable?(fn) } dylibs.reject! { |fn| fn =~ /^@(loader_|executable_|r)path/ }
dylibs.each(&block) dylibs.each(&block)
end end
def dylib_id_for(file) def dylib_id_for(file)
return file.dylib_id if filename_contains_metavariable?(file.dylib_id)
# The new dylib ID should have the same basename as the old dylib ID, not # The new dylib ID should have the same basename as the old dylib ID, not
# the basename of the file itself. # the basename of the file itself.
basename = File.basename(file.dylib_id) basename = File.basename(file.dylib_id)