diff options
| author | Mike McQuaid | 2016-10-12 11:18:14 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-10-12 11:18:14 +0100 |
| commit | 784b71cb025bff303d27a61abe8aa709ca5587c4 (patch) | |
| tree | 5ade4ac148582c0e8e3059d60fb1e2204671e80a /Library/Homebrew | |
| parent | fcc9cfa6ae01b8c04f217692c69ed5e1e629baad (diff) | |
| download | brew-784b71cb025bff303d27a61abe8aa709ca5587c4.tar.bz2 | |
Tweak style.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/requirements/apr_requirement.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Library/Homebrew/requirements/apr_requirement.rb b/Library/Homebrew/requirements/apr_requirement.rb index 440788def..edfad1752 100644 --- a/Library/Homebrew/requirements/apr_requirement.rb +++ b/Library/Homebrew/requirements/apr_requirement.rb @@ -7,18 +7,19 @@ class AprRequirement < Requirement # 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 - MacOS.version > :leopard && MacOS.version < :sierra && - MacOS::CLT.installed? || Formula["apr-util"].installed? + next false if MacOS.version <= :leopard + next false if MacOS.version >= :sierra + MacOS::CLT.installed? || Formula["apr-util"].installed? end env do - # Prefer system Apr as much as possible, even if our's is installed. - unless MacOS.version > :leopard && MacOS.version < :sierra && 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 |