Skip to content
Snippets Groups Projects
Commit 27e184f5 authored by Jack Nagel's avatar Jack Nagel
Browse files

Mark some requirements that don't need the build environment

parent e40b7352
No related branches found
No related tags found
No related merge requests found
......@@ -100,7 +100,7 @@ class ArchRequirement < Requirement
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
......
......@@ -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?
......
......@@ -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)
......
......@@ -8,7 +8,7 @@ class MaximumMacOSRequirement < Requirement
super
end
satisfy { MacOS.version <= @version }
satisfy(:build_env => false) { MacOS.version <= @version }
def message
<<-EOS.undent
......
......@@ -8,7 +8,7 @@ class MinimumMacOSRequirement < Requirement
super
end
satisfy { MacOS.version >= @version }
satisfy(:build_env => false) { MacOS.version >= @version }
def message
"OS X #{@version.pretty_name} or newer is required."
......
......@@ -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 @@ end
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
......
......@@ -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")
......
......@@ -3,7 +3,7 @@ require 'requirement'
class UnsignedKextRequirement < Requirement
fatal true
satisfy { MacOS.version < :yosemite }
satisfy(:build_env => false) { MacOS.version < :yosemite }
def message
s = <<-EOS.undent
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment