aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilovezfs2017-07-27 09:18:17 -0700
committerGitHub2017-07-27 09:18:17 -0700
commit867590b648674a1cda1cad68ba50d9f861b12bfe (patch)
tree48d3f5fc2f55844d450b77b92ca400815d833b4c
parent021729e1646212d47d3f52c0b29034e7da97693b (diff)
parentdeac8f14bb5b7837c3528d07cb19394b106ef7e5 (diff)
downloadbrew-867590b648674a1cda1cad68ba50d9f861b12bfe.tar.bz2
Merge pull request #2954 from ilovezfs/allow-install-mixed-build-dependency-tree1.2.6
formula_installer: allow version mismatched build deps
-rw-r--r--Library/Homebrew/formula_installer.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 27786e77e..a0c091e7f 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -151,6 +151,8 @@ class FormulaInstaller
recursive_deps = formula.recursive_dependencies
recursive_formulae = recursive_deps.map(&:to_formula)
+ recursive_runtime_deps = formula.recursive_dependencies.reject(&:build?)
+ recursive_runtime_formulae = recursive_runtime_deps.map(&:to_formula)
recursive_dependencies = []
recursive_formulae.each do |dep|
@@ -176,7 +178,7 @@ class FormulaInstaller
version_hash = {}
version_conflicts = Set.new
- recursive_formulae.each do |f|
+ recursive_runtime_formulae.each do |f|
name = f.name
unversioned_name, = name.split("@")
version_hash[unversioned_name] ||= Set.new