Merge pull request #2815 from ilovezfs/runtime-requirements

formula_installer: make unsatisifed recursive build reqs non-fatal for bottles

1 files changed, 11 insertions, 0 deletions

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 2a5120342..a365c967a 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -409,12 +409,21 @@ class FormulaInstaller
     install_bottle_for?(dependent, build)
   end
 
+  def runtime_requirements(formula)
+    runtime_deps = formula.runtime_dependencies.map(&:to_formula)
+    recursive_requirements = formula.recursive_requirements do |dependent, _|
+      Requirement.prune unless runtime_deps.include?(dependent)
+    end
+    (recursive_requirements.to_a + formula.requirements.to_a).reject(&:build?).uniq
+  end
+
   def expand_requirements
     unsatisfied_reqs = Hash.new { |h, k| h[k] = [] }
     deps = []
     formulae = [formula]
 
     while f = formulae.pop
+      runtime_requirements = runtime_requirements(f)
       f.recursive_requirements do |dependent, req|
         build = effective_build_options_for(dependent)
 
@@ -429,6 +438,8 @@ class FormulaInstaller
           Requirement.prune
         elsif req.satisfied?
           Requirement.prune
+        elsif !runtime_requirements.include?(req) && install_bottle_for?(dependent, build)
+          Requirement.prune
         else
           unsatisfied_reqs[dependent] << req
         end