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

Mark some requirements that don't need the build environment

Browse Source
This commit is contained in:
Jack Nagel 2015-06-25 23:55:45 -04:00
parent e40b735217
commit 27e184f543
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/requirements.rb
View File

@ -100,7 +100,7 @@ class ArchRequirement < Requirement
super super
end end
satisfy do satisfy(:build_env => false) do
case @arch case @arch
when :x86_64 then MacOS.prefer_64_bit? when :x86_64 then MacOS.prefer_64_bit?
when :intel, :ppc then Hardware::CPU.type == @arch when :intel, :ppc then Hardware::CPU.type == @arch

2
Library/Homebrew/requirements/apr_requirement.rb
View File

@ -4,7 +4,7 @@ class AprRequirement < Requirement
fatal true fatal true
default_formula "apr-util" default_formula "apr-util"
satisfy { MacOS::CLT.installed? } satisfy(:build_env => false) { MacOS::CLT.installed? }
env do env do
unless MacOS::CLT.installed? unless MacOS::CLT.installed?

2
Library/Homebrew/requirements/java_requirement.rb
View File

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

2
Library/Homebrew/requirements/maximum_macos_requirement.rb
View File

@ -8,7 +8,7 @@ class MaximumMacOSRequirement < Requirement
super super
end end
satisfy { MacOS.version <= @version } satisfy(:build_env => false) { MacOS.version <= @version }
def message def message
<<-EOS.undent <<-EOS.undent

2
Library/Homebrew/requirements/minimum_macos_requirement.rb
View File

@ -8,7 +8,7 @@ class MinimumMacOSRequirement < Requirement
super super
end end
satisfy { MacOS.version >= @version } satisfy(:build_env => false) { MacOS.version >= @version }
def message def message
"OS X #{@version.pretty_name} or newer is required." "OS X #{@version.pretty_name} or newer is required."

4
Library/Homebrew/requirements/osxfuse_requirement.rb
View File

@ -6,7 +6,7 @@ class OsxfuseRequirement < Requirement
cask "osxfuse" cask "osxfuse"
download "https://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? def self.binary_osxfuse_installed?
File.exist?("/usr/local/include/osxfuse/fuse.h") && !File.symlink?("/usr/local/include/osxfuse") File.exist?("/usr/local/include/osxfuse/fuse.h") && !File.symlink?("/usr/local/include/osxfuse")
@ -19,7 +19,7 @@ end
class NonBinaryOsxfuseRequirement < Requirement class NonBinaryOsxfuseRequirement < Requirement
fatal true 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 def message
<<-EOS.undent <<-EOS.undent

2
Library/Homebrew/requirements/tuntap_requirement.rb
View File

@ -4,7 +4,7 @@ class TuntapRequirement < Requirement
fatal true fatal true
default_formula "tuntap" default_formula "tuntap"
cask "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? def self.binary_tuntap_installed?
File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext") File.exist?("/Library/Extensions/tun.kext") && File.exist?("/Library/Extensions/tap.kext")

2
Library/Homebrew/requirements/unsigned_kext_requirement.rb
View File

@ -3,7 +3,7 @@ require 'requirement'
class UnsignedKextRequirement < Requirement class UnsignedKextRequirement < Requirement
fatal true fatal true
satisfy { MacOS.version < :yosemite } satisfy(:build_env => false) { MacOS.version < :yosemite }
def message def message
s = <<-EOS.undent s = <<-EOS.undent