Mark some requirements that don't need the build environment

aklish · Jun 26, 2015 · 27e184f · 27e184f
1 parent e40b735
commit 27e184f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
@@ -100,7 +100,7 @@ def initialize(arch)
     super
   end
 
-  satisfy do
+  satisfy(:build_env => false) do
     case @arch
     when :x86_64 then MacOS.prefer_64_bit?
     when :intel, :ppc then Hardware::CPU.type == @arch

diff --git a/Library/Homebrew/requirements/apr_requirement.rb b/Library/Homebrew/requirements/apr_requirement.rb
@@ -4,7 +4,7 @@ class AprRequirement < Requirement
   fatal true
   default_formula "apr-util"
 
-  satisfy { MacOS::CLT.installed? }
+  satisfy(:build_env => false) { MacOS::CLT.installed? }
 
   env do
     unless MacOS::CLT.installed?

diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb
@@ -5,7 +5,7 @@ class JavaRequirement < Requirement
   cask "java"
   download "http://www.oracle.com/technetwork/java/javase/downloads/index.html"
 
-  satisfy { java_version }
+  satisfy(:build_env => false) { java_version }
 
   env do
     java_home = Pathname.new(@java_home)

diff --git a/Library/Homebrew/requirements/maximum_macos_requirement.rb b/Library/Homebrew/requirements/maximum_macos_requirement.rb
@@ -8,7 +8,7 @@ def initialize(tags)
     super
   end
 
-  satisfy { MacOS.version <= @version }
+  satisfy(:build_env => false) { MacOS.version <= @version }
 
   def message
     <<-EOS.undent

diff --git a/Library/Homebrew/requirements/minimum_macos_requirement.rb b/Library/Homebrew/requirements/minimum_macos_requirement.rb
@@ -8,7 +8,7 @@ def initialize(tags)
     super
   end
 
-  satisfy { MacOS.version >= @version }
+  satisfy(:build_env => false) { MacOS.version >= @version }
 
   def message
     "OS X #{@version.pretty_name} or newer is required."

diff --git a/Library/Homebrew/requirements/osxfuse_requirement.rb b/Library/Homebrew/requirements/osxfuse_requirement.rb
@@ -6,7 +6,7 @@ class OsxfuseRequirement < Requirement
   cask "osxfuse"
   download "https://osxfuse"
 
-  satisfy { Formula["osxfuse"].installed? || self.class.binary_osxfuse_installed? }
+  satisfy(:build_env => false) { Formula["osxfuse"].installed? || self.class.binary_osxfuse_installed? }
 
   def self.binary_osxfuse_installed?
     File.exist?("/usr/local/include/osxfuse/fuse.h") && !File.symlink?("/usr/local/include/osxfuse")
@@ -19,7 +19,7 @@ def self.binary_osxfuse_installed?
 
 class NonBinaryOsxfuseRequirement < Requirement
   fatal true
-  satisfy { HOMEBREW_PREFIX.to_s != "/usr/local" || !OsxfuseRequirement.binary_osxfuse_installed? }
+  satisfy(:build_env => false) { HOMEBREW_PREFIX.to_s != "/usr/local" || !OsxfuseRequirement.binary_osxfuse_installed? }
 
   def message
     <<-EOS.undent

diff --git a/Library/Homebrew/requirements/tuntap_requirement.rb b/Library/Homebrew/requirements/tuntap_requirement.rb
@@ -4,7 +4,7 @@ class TuntapRequirement < Requirement
   fatal true
   default_formula "tuntap"
   cask "tuntap"
-  satisfy { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? }
+  satisfy(:build_env => false) { self.class.binary_tuntap_installed? || Formula["tuntap"].installed? }
 
   def self.binary_tuntap_installed?
     File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext")

diff --git a/Library/Homebrew/requirements/unsigned_kext_requirement.rb b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
@@ -3,7 +3,7 @@
 class UnsignedKextRequirement < Requirement
   fatal true
 
-  satisfy { MacOS.version < :yosemite }
+  satisfy(:build_env => false) { MacOS.version < :yosemite }
 
   def message
     s = <<-EOS.undent