keg_relocate: add HOMEBREW_PREFIX/lib to rpaths

Library/Homebrew/extend/os/mac/keg_relocate.rb

@@ -73,6 +73,12 @@ def fix_dynamic_linkage
  end
  end
  end
+
+ next if HOMEBREW_PREFIX.to_s == "/usr/local"
+ next if file.rpaths.include?("#{HOMEBREW_PREFIX}/lib")
+
+ loader_name = loader_name_for(file, "#{HOMEBREW_PREFIX}/lib")
+ add_rpath(loader_name, file)
  end
  end
 

Library/Homebrew/os/mac/keg.rb

@@ -50,6 +50,18 @@
  raise
  end
 
+ def add_rpath(rpath, file)
+ @require_relocation = rpath.start_with?(HOMEBREW_PREFIX.to_s)
+ odebug "Adding rpath #{rpath} in #{file}"
+ file.add_rpath(rpath, strict: false)
+ codesign_patched_binary(file)
+ rescue MachO::MachOError
+ onoe <<~EOS
+ Failed adding rpath #{rpath} in #{file}
+ EOS
+ raise
+ end
+
  def delete_rpath(rpath, file)
  odebug "Deleting rpath #{rpath} in #{file}"
  file.delete_rpath(rpath, strict: false)

Library/Homebrew/os/mac/mach.rb

@@ -59,6 +59,11 @@ def mach_data
 
  # TODO: See if the `#write!` call can be delayed until
  # we know we're not making any changes to the rpaths.
+ def add_rpath(rpath, **options)
+ macho.add_rpath(rpath, options)
+ macho.write!
+ end
+
  def delete_rpath(rpath, **options)
  macho.delete_rpath(rpath, options)
  macho.write!