Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

keg_relocate (linux): prepend gcc/lib/current to RPATH when needed #13631

Merged
merged 3 commits into from
Aug 2, 2022
Merged

keg_relocate (linux): prepend gcc/lib/current to RPATH when needed #13631

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53fdb64
keg_relocate (linux): prepend `gcc/lib/current` to `RPATH` when needed
carlocab Aug 2, 2022
532460c
keg_relocate: fix new GCC lib directory
carlocab Aug 2, 2022
1c0eac7
Exclude GCC formulae from RPATH modification for GCC
carlocab Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Library/Homebrew/extend/os/linux/keg_relocate.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ def change_rpath(file, old_prefix, new_prefix)
lib_path = "#{new_prefix}/lib"
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(":")
end
updated[:rpath] = new_rpath if old_rpath != new_rpath
Expand Down