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

Merge pull request #1488 from MikeMcQuaid/filter-formula-options

Browse Source 
Filter formula build options based on those that exist.
This commit is contained in:
Mike McQuaid 2016-11-13 10:50:16 +00:00 committed by GitHub
commit b34bd4fa12
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/cmd/reinstall.rb
View File

@ -22,6 +22,7 @@ module Homebrew
def reinstall_formula(f) def reinstall_formula(f)
options = BuildOptions.new(Options.create(ARGV.flags_only), f.options).used_options options = BuildOptions.new(Options.create(ARGV.flags_only), f.options).used_options
options |= f.build.used_options options |= f.build.used_options
options &= f.options
notice = "Reinstalling #{f.full_name}" notice = "Reinstalling #{f.full_name}"
notice += " with #{options * ", "}" unless options.empty? notice += " with #{options * ", "}" unless options.empty?

1
Library/Homebrew/cmd/upgrade.rb
View File

@ -96,6 +96,7 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = f.build.used_options fi.options = f.build.used_options
fi.options &= f.options
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?) fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source? fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?

1
Library/Homebrew/formula_installer.rb
View File

@ -457,6 +457,7 @@ class FormulaInstaller
fi.options |= tab.used_options fi.options |= tab.used_options
fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
fi.options |= inherited_options fi.options |= inherited_options
fi.options &= df.options
fi.build_from_source = ARGV.build_formula_from_source?(df) fi.build_from_source = ARGV.build_formula_from_source?(df)
fi.verbose = verbose? && !quieter? fi.verbose = verbose? && !quieter?
fi.debug = debug? fi.debug = debug?