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

Fix Linux-only GCC dependency check.

Browse Source 
This is based on feedback from code review.
This commit is contained in:
Carlo Cabrera 2022-08-22 14:54:52 +08:00
parent 4302af67b7
commit 718cf8b0df
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/Homebrew/formula_auditor.rb
View File

@ -333,21 +333,11 @@ module Homebrew
return unless @core_tap return unless @core_tap
# Prevent formulae from declaring Linux-only dependencies on GCC, bad_gcc_dep = linux_only_gcc_dep?(formula) && (@strict || begin
# or else its dependency tree grows out of control.
on_linux_deps = formula.to_hash_with_variations.dig("variations", :x86_64_linux, "dependencies")
if on_linux_deps&.include? "gcc"
bad_gcc_dep = @strict || begin
fv = FormulaVersions.new(formula) fv = FormulaVersions.new(formula)
prev_on_linux_deps = fv.formula_at_revision("origin/HEAD") do |prev_f| fv.formula_at_revision("origin/HEAD") { |prev_f| !linux_only_gcc_dep?(prev_f) }
prev_f.to_hash_with_variations.dig("variations", :x86_64_linux, "dependencies") end)
end
prev_on_linux_deps&.exclude? "gcc"
end
problem "Formulae in homebrew/core should not have a Linux-only dependency on GCC." if bad_gcc_dep problem "Formulae in homebrew/core should not have a Linux-only dependency on GCC." if bad_gcc_dep
end
return if formula.tap&.audit_exception :versioned_dependencies_conflicts_allowlist, formula.name return if formula.tap&.audit_exception :versioned_dependencies_conflicts_allowlist, formula.name
@ -865,5 +855,16 @@ module Homebrew
def head_only?(formula) def head_only?(formula)
formula.head && formula.stable.nil? formula.head && formula.stable.nil?
end end
def linux_only_gcc_dep?(formula)
# TODO: Make this check work when running on Linux and not simulating macOS too.
return false unless Homebrew::SimulateSystem.simulating_or_running_on_macos?
formula_hash = formula.to_hash_with_variations
deps = formula_hash["dependencies"]
linux_deps = formula_hash.dig("variations", :x86_64_linux, "dependencies")
deps.exclude?("gcc") && linux_deps&.include?("gcc")
end
end end
end end