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

os/mac/keg_relocate: avoid changing to an already existing rpath

Browse Source 
Doing `change_rpath(old, new, file)` will error if `new` is already an
rpath for `file`. When this happens, `old` is no longer needed, so we
can delete it.

Fixes a build failure at shivammathur/homebrew-php#1848.
This commit is contained in:
Carlo Cabrera 2023-07-18 20:47:10 +08:00
parent 8bfe579e8a
commit 27032e002f
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,15 @@ class Keg
else else
new_name = opt_name_for(bad_name) new_name = opt_name_for(bad_name)
loader_name = loader_name_for(file, new_name) loader_name = loader_name_for(file, new_name)
change_rpath(bad_name, loader_name, file) if loader_name != bad_name next if loader_name == bad_name
if file.rpaths(resolve_variable_references: false).include?(loader_name)
# The wanted loader_name is already an rpath, so the existing bad_name is not needed.
# Attempting to change bad_name to an already existing rpath will produce an error.
delete_rpath(bad_name, file)
else
change_rpath(bad_name, loader_name, file)
end
end end
end end
end end