From 715132642fa6e9a418636f99a65eecde46d36ab5 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 4 Apr 2017 13:29:27 +0100 Subject: [PATCH] Revert "keg_relocate: Don't relocate dylib IDs containing metavariables." --- Library/Homebrew/extend/os/mac/keg_relocate.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/keg_relocate.rb b/Library/Homebrew/extend/os/mac/keg_relocate.rb index 476e5da4a4..f44a97b31d 100644 --- a/Library/Homebrew/extend/os/mac/keg_relocate.rb +++ b/Library/Homebrew/extend/os/mac/keg_relocate.rb @@ -78,19 +78,13 @@ class Keg end end - def filename_contains_metavariable?(fn) - fn =~ /^@(loader_|executable_|r)path/ - end - def each_install_name_for(file, &block) dylibs = file.dynamically_linked_libraries - dylibs.reject! { |fn| filename_contains_metavariable?(fn) } + dylibs.reject! { |fn| fn =~ /^@(loader_|executable_|r)path/ } dylibs.each(&block) end 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 basename of the file itself. basename = File.basename(file.dylib_id)