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

os/mac/keg_relocate: replace Cellar references in rpaths

Browse Source 
Some formulae (e.g. `php`) use rpaths that reference Cellar paths
belonging to other formulae. Let's make sure these rpaths don't break by
making them use opt paths instead.
This commit is contained in:
Carlo Cabrera 2023-07-17 14:09:35 +08:00
parent bd5bd8437f
commit a7c8aab68c
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,8 @@ class Keg
if rooted_in_build_directory?(bad_name) || (file.rpaths.count(bad_name) > 1) if rooted_in_build_directory?(bad_name) || (file.rpaths.count(bad_name) > 1)
delete_rpath(bad_name, file) delete_rpath(bad_name, file)
else else
loader_name = loader_name_for(file, bad_name) new_name = opt_name_for(bad_name)
loader_name = loader_name_for(file, new_name)
change_rpath(bad_name, loader_name, file) if loader_name != bad_name change_rpath(bad_name, loader_name, file) if loader_name != bad_name
end end
end end
@ -203,6 +204,18 @@ class Keg
private private
CELLAR_RX = %r{\A#{HOMEBREW_CELLAR}/(?<formula_name>[^/]+)/[^/]+}.freeze
# Replace HOMEBREW_CELLAR references with HOMEBREW_PREFIX/opt references
# if the Cellar reference is to a different keg.
def opt_name_for(filename)
return filename unless filename.start_with?(HOMEBREW_PREFIX.to_s)
return filename if filename.start_with?(path.to_s)
return filename if (matches = CELLAR_RX.match(filename)).blank?
filename.sub(CELLAR_RX, "#{HOMEBREW_PREFIX}/opt/#{matches[:formula_name]}")
end
def rooted_in_build_directory?(filename) def rooted_in_build_directory?(filename)
# CMake normalises `/private/tmp` to `/tmp`. # CMake normalises `/private/tmp` to `/tmp`.
# https://gitlab.kitware.com/cmake/cmake/-/issues/23251 # https://gitlab.kitware.com/cmake/cmake/-/issues/23251