diff options
| author | Mike McQuaid | 2016-10-12 11:38:57 +0100 |
|---|---|---|
| committer | GitHub | 2016-10-12 11:38:57 +0100 |
| commit | a812e9541799d6a296c561dadcb6aec3a0418c75 (patch) | |
| tree | 55141af9101d497e5a2e29af2c6c8006609f371f /Library | |
| parent | 5e90c5a7a4fc002dd7a761a71bdd36be4b596a04 (diff) | |
| parent | 784b71cb025bff303d27a61abe8aa709ca5587c4 (diff) | |
| download | brew-a812e9541799d6a296c561dadcb6aec3a0418c75.tar.bz2 | |
Merge pull request #1227 from DomT4/apr
apr_requirement: use Homebrew's Apr for Sierra
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/requirements/apr_requirement.rb | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Library/Homebrew/requirements/apr_requirement.rb b/Library/Homebrew/requirements/apr_requirement.rb index 9c07eeaeb..edfad1752 100644 --- a/Library/Homebrew/requirements/apr_requirement.rb +++ b/Library/Homebrew/requirements/apr_requirement.rb @@ -4,16 +4,22 @@ class AprRequirement < Requirement fatal true default_formula "apr-util" - # APR shipped in Tiger is too old, but Leopard+ is usable - satisfy(build_env: false) { MacOS.version > :leopard && MacOS::CLT.installed? } + # APR shipped in Tiger is too old, but Leopard+ is usable. + # The *-config scripts were removed in Sierra, which is widely breaking. + satisfy(build_env: false) do + next false if MacOS.version <= :leopard + next false if MacOS.version >= :sierra + MacOS::CLT.installed? || Formula["apr-util"].installed? + end env do - unless MacOS::CLT.installed? - ENV.prepend_path "PATH", Formula["apr-util"].opt_bin - ENV.prepend_path "PATH", Formula["apr"].opt_bin - ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig" - ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig" - end + next if MacOS.version <= :leopard + next if MacOS.version >= :sierra + next if MacOS::CLT.installed? + ENV.prepend_path "PATH", Formula["apr-util"].opt_bin + ENV.prepend_path "PATH", Formula["apr"].opt_bin + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig" + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig" end def to_dependency |