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

Consider on-disk state when computing dependencies

Browse Source 
Fixes Homebrew/homebrew#28754.
Fixes Homebrew/homebrew#29846.
Fixes Homebrew/homebrew#30920.
This commit is contained in:
Jack Nagel 2014-08-24 14:46:34 -05:00
parent b0c1e5f7d6
commit 8aabba670f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/build.rb
View File

@ -79,9 +79,16 @@ class Build
end
end
def effective_build_options_for(dependent)
args = dependent.build.used_options
args |= Tab.for_formula(dependent).used_options
BuildOptions.new(args, dependent.options)
end
def expand_reqs
f.recursive_requirements do |dependent, req|
if (req.optional? || req.recommended?) && dependent.build.without?(req)
build = effective_build_options_for(dependent)
if (req.optional? || req.recommended?) && build.without?(req)
Requirement.prune
elsif req.build? && dependent != f
Requirement.prune
@ -94,7 +101,8 @@ class Build
def expand_deps
f.recursive_dependencies do |dependent, dep|
if (dep.optional? || dep.recommended?) && dependent.build.without?(dep)
build = effective_build_options_for(dependent)
if (dep.optional? || dep.recommended?) && build.without?(dep)
Dependency.prune
elsif dep.build? && dependent != f
Dependency.prune

1
Library/Homebrew/formula_installer.rb
View File

@ -301,6 +301,7 @@ class FormulaInstaller
def effective_build_options_for(dependent, inherited_options=[])
args = dependent.build.used_options
args |= dependent == f ? options : inherited_options
args |= Tab.for_formula(dependent).used_options
BuildOptions.new(args, dependent.options)
end