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

Merge pull request #13631 from carlocab/gcc-rpaths

Browse Source 
keg_relocate (linux): prepend `gcc/lib/current` to `RPATH` when needed
This commit is contained in:
Carlo Cabrera 2022-08-02 19:40:40 +08:00 committed by GitHub
commit 716136bfc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/extend/os/linux/keg_relocate.rb
View File

@ -33,6 +33,18 @@ class Keg
lib_path = "#{new_prefix}/lib" lib_path = "#{new_prefix}/lib"
rpath << lib_path unless rpath.include? lib_path rpath << lib_path unless rpath.include? lib_path
# Add GCC's lib directory (as of GCC 12+) to RPATH when there is existing linkage.
# This fixes linkage for newly-poured bottles.
if !name.match?(Version.formula_optionally_versioned_regex(:gcc)) &&
rpath.any? { |rp| rp.match?(%r{lib/gcc/\d+$}) }
# TODO: Replace with
# rpath.map! { |path| path = path.sub(%r{lib/gcc/\d+$}, "lib/gcc/current") }
# when
# 1. Homebrew/homebrew-core#106755 is merged
# 2. No formula has a runtime dependency on a versioned GCC (see `envoy.rb`)
rpath.prepend HOMEBREW_PREFIX/"opt/gcc/lib/gcc/current"
end
rpath.join(":") rpath.join(":")
end end
updated[:rpath] = new_rpath if old_rpath != new_rpath updated[:rpath] = new_rpath if old_rpath != new_rpath