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

extend/os/mac/keg_relocate: fix post-bottling dylib ID relocation

Browse Source 
Running `brew bottle` changes dylib IDs, install names, and rpaths into
placeholders for the bottle, creates a bottle tarball, and then changes
the placeholders back to their correct values.

With my refactoring in #11358, the behaviour of this relocation changed:
dylib IDs would no longer be changed back from placeholders into their
correct values after the creation of the bottle tarball.
This commit is contained in:
Carlo Cabrera 2021-05-12 21:37:33 +01:00
parent 6b8ed45db3
commit c7de544fe8
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,8 @@ class Keg
mach_o_files.each do |file| mach_o_files.each do |file|
file.ensure_writable do file.ensure_writable do
if file.dylib? if file.dylib?
id = relocated_name_for(dylib_id_for(file), relocation) id = relocated_name_for(file.dylib_id, relocation)
change_dylib_id(id, file) if id change_dylib_id(id, file)
end end
each_install_name_for(file) do |old_name| each_install_name_for(file) do |old_name|