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

FormulaInstaller: skip build-time deps for bottles

Browse Source
This commit is contained in:
Jack Nagel 2013-01-23 00:26:25 -06:00
parent 43d9f480af
commit ea4188ecda
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/formula_installer.rb
View File

@ -104,6 +104,8 @@ class FormulaInstaller
f.recursive_requirements.reject(&:satisfied?) f.recursive_requirements.reject(&:satisfied?)
end end
needed_reqs.reject!(&:build?) if install_bottle
unless needed_reqs.empty? unless needed_reqs.empty?
puts needed_reqs.map(&:message) * "\n" puts needed_reqs.map(&:message) * "\n"
fatals = needed_reqs.select(&:fatal?) fatals = needed_reqs.select(&:fatal?)
@ -116,6 +118,9 @@ class FormulaInstaller
if dep_f.installed? if dep_f.installed?
# If the dep is already installed, skip it. # If the dep is already installed, skip it.
false false
elsif install_bottle and dep.build?
# We skip build-time deps when installing bottles.
false
else else
# Otherwise, we need to install it. # Otherwise, we need to install it.
true true