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

Ensure build deps are installed for deps with inherited options

Browse Source 
Fixes Homebrew/homebrew#28144.
This commit is contained in:
Jack Nagel 2014-04-05 10:40:04 -05:00
parent dbe06bbbfc
commit 1e20d9149b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/formula_installer.rb
View File

@ -292,8 +292,8 @@ class FormulaInstaller
expanded_deps = ARGV.filter_for_dependencies do expanded_deps = ARGV.filter_for_dependencies do
Dependency.expand(f, deps) do |dependent, dep| Dependency.expand(f, deps) do |dependent, dep|
options = inherited_options[dep] = inherited_options_for(dep) options = inherited_options[dep.name] = inherited_options_for(dep)
build = effective_build_options_for(dependent) build = effective_build_options_for(dependent, inherited_options[dependent.name])
if (dep.optional? || dep.recommended?) && build.without?(dep) if (dep.optional? || dep.recommended?) && build.without?(dep)
Dependency.prune Dependency.prune
@ -309,16 +309,18 @@ class FormulaInstaller
end end
end end
expanded_deps.map { |dep| [dep, inherited_options[dep]] } expanded_deps.map { |dep| [dep, inherited_options[dep.name]] }
end end
def effective_build_options_for(dependent) def effective_build_options_for(dependent, inherited_options=[])
if dependent == f if dependent == f
build = dependent.build.dup build = dependent.build.dup
build.args |= options build.args |= options
build build
else else
dependent.build build = dependent.build.dup
build.args |= inherited_options
build
end end
end end