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

mac/keg_relocate: Prefer String#/, add ENV check

Browse Source
This commit is contained in:
William Woodruff 2018-12-19 20:00:14 -05:00
parent 27d6cfb12e
commit a6bcbdb20d
No known key found for this signature in database
GPG Key ID: 600D68320BE45ACC
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,10 +79,10 @@ class Keg
suffix = bad_name.sub(/^@rpath/, "") suffix = bad_name.sub(/^@rpath/, "")
# short circuit: we expect lib to be usually correct, so we try it first # short circuit: we expect lib to be usually correct, so we try it first
return (lib + suffix) if (lib + suffix).exist? return (lib / suffix) if (lib / suffix).exist?
file.rpaths.each do |rpath| file.rpaths.each do |rpath|
return (rpath + suffix) if (rpath + suffix).exist? return (rpath / suffix) if (rpath / suffix).exist?
end end
opoo "Could not expand an RPATH in #{file}" opoo "Could not expand an RPATH in #{file}"
@ -101,7 +101,7 @@ class Keg
"@loader_path/#{bad_name}" "@loader_path/#{bad_name}"
elsif file.mach_o_executable? && (lib + bad_name).exist? elsif file.mach_o_executable? && (lib + bad_name).exist?
"#{lib}/#{bad_name}" "#{lib}/#{bad_name}"
elsif bad_name.start_with? "@rpath" elsif bad_name.start_with? "@rpath" && ENV["HOMEBREW_RELOCATE_RPATHS"]
expand_rpath bad_name expand_rpath bad_name
elsif (abs_name = find_dylib(bad_name)) && abs_name.exist? elsif (abs_name = find_dylib(bad_name)) && abs_name.exist?
abs_name.to_s abs_name.to_s