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

os/mac/keg_relocate: add fallback to default Perl version when using tab

Browse Source 
While this should never be necessary for per-OS bottles, this could be useful for :all bottles where the OS it was built on uses a Perl version that doesn't exist on all macOS versions.
This commit is contained in:
Bo Anderson 2021-05-31 16:29:23 +01:00
parent 5115cc25fa
commit 1fc39d2d0d
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,13 +159,16 @@ class Keg
brewed_perl = runtime_dependencies&.any? { |dep| dep["full_name"] == "perl" && dep["declared_directly"] } brewed_perl = runtime_dependencies&.any? { |dep| dep["full_name"] == "perl" && dep["declared_directly"] }
perl_path = if brewed_perl || name == "perl" perl_path = if brewed_perl || name == "perl"
"#{HOMEBREW_PREFIX}/opt/perl/bin/perl" "#{HOMEBREW_PREFIX}/opt/perl/bin/perl"
elsif tab["built_on"].present?
perl_path = "/usr/bin/perl#{tab["built_on"]["preferred_perl"]}"
# For `:all` bottles, we could have built this bottle with a Perl we don't have.
# Such bottles typically don't have strict version requirements.
perl_path = "/usr/bin/perl#{MacOS.preferred_perl_version}" unless File.exist?(perl_path)
perl_path
else else
perl_version = if tab["built_on"].present? "/usr/bin/perl#{MacOS.preferred_perl_version}"
tab["built_on"]["preferred_perl"]
else
MacOS.preferred_perl_version
end
"/usr/bin/perl#{perl_version}"
end end
relocation.add_replacement_pair(:perl, PERL_PLACEHOLDER, perl_path) relocation.add_replacement_pair(:perl, PERL_PLACEHOLDER, perl_path)