From 784b71cb025bff303d27a61abe8aa709ca5587c4 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 12 Oct 2016 11:18:14 +0100
Subject: [PATCH] Tweak style.
---
.../Homebrew/requirements/apr_requirement.rb | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/Library/Homebrew/requirements/apr_requirement.rb b/Library/Homebrew/requirements/apr_requirement.rb
index 440788def8..edfad1752c 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
--
GitLab