From 96ff4102c85dd56f6de6fa84278fadbfe61279eb Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 11 Jun 2018 00:45:25 -0400 Subject: [PATCH 1/3] formula_installer: Don't check devtools if pouring --- Library/Homebrew/formula_installer.rb | 4 ++++ Library/Homebrew/install.rb | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 4ba3a7416f..1fd1514e92 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -219,6 +219,10 @@ class FormulaInstaller end def install + if DevelopmentTools.installed? && !pour_bottle? + Install.check_development_tools + end + # not in initialize so upgrade can unlink the active keg before calling this # function but after instantiating this class so that it can avoid having to # relink the active keg if possible (because it is slow). diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index f426db2b09..f86c096a9d 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -47,7 +47,6 @@ module Homebrew def perform_preinstall_checks check_ppc check_writable_install_location - check_development_tools if DevelopmentTools.installed? check_cellar end end From ab568800a771efafefb788c7dff53544ecb9225e Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 11 Jun 2018 10:38:32 -0400 Subject: [PATCH 2/3] formula_installer: Check for bottle_unneeded --- Library/Homebrew/formula_installer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 1fd1514e92..28d1278161 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -219,7 +219,7 @@ class FormulaInstaller end def install - if DevelopmentTools.installed? && !pour_bottle? + if !formula.bottle_unneeded? && !pour_bottle? && DevelopmentTools.installed? Install.check_development_tools end From dabf5c40a11adabfef6c5c2465731732b7f8d01d Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 11 Jun 2018 20:45:06 -0400 Subject: [PATCH 3/3] formula_installer: require "install" --- Library/Homebrew/formula_installer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 28d1278161..f8106340ca 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -13,6 +13,7 @@ require "emoji" require "development_tools" require "cache_store" require "linkage_checker" +require "install" class FormulaInstaller include FormulaCellarChecks @@ -220,7 +221,7 @@ class FormulaInstaller def install if !formula.bottle_unneeded? && !pour_bottle? && DevelopmentTools.installed? - Install.check_development_tools + Homebrew::Install.check_development_tools end # not in initialize so upgrade can unlink the active keg before calling this