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

Merge pull request #11342 from carlocab/pour-rpath

Browse Source 
formula_installer: set `HOMEBREW_RELOCATE_RPATHS`
This commit is contained in:
Carlo Cabrera 2021-05-07 20:07:28 +01:00 committed by GitHub
commit 25045e658e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -1156,7 +1156,11 @@ class FormulaInstaller
end end
skip_linkage = formula.bottle_specification.skip_relocation? skip_linkage = formula.bottle_specification.skip_relocation?
keg.replace_placeholders_with_locations tab.changed_files, skip_linkage: skip_linkage # TODO: Remove `with_env` when bottles are built with RPATH relocation enabled
# https://github.com/Homebrew/brew/issues/11329
with_env(HOMEBREW_RELOCATE_RPATHS: "1") do
keg.replace_placeholders_with_locations tab.changed_files, skip_linkage: skip_linkage
end
# fill in missing/outdated parts of the tab # fill in missing/outdated parts of the tab
# keep in sync with Tab#to_bottle_json # keep in sync with Tab#to_bottle_json