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

Tweak style.

Browse Source
This commit is contained in:
Mike McQuaid 2016-10-12 11:18:14 +01:00
parent fcc9cfa6ae
commit 784b71cb02
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,18 +7,19 @@ class AprRequirement < Requirement
# APR shipped in Tiger is too old, but Leopard+ is usable. # APR shipped in Tiger is too old, but Leopard+ is usable.
# The *-config scripts were removed in Sierra, which is widely breaking. # The *-config scripts were removed in Sierra, which is widely breaking.
satisfy(build_env: false) do satisfy(build_env: false) do
MacOS.version > :leopard && MacOS.version < :sierra && next false if MacOS.version <= :leopard
MacOS::CLT.installed? || Formula["apr-util"].installed? next false if MacOS.version >= :sierra
MacOS::CLT.installed? || Formula["apr-util"].installed?
end end
env do env do
# Prefer system Apr as much as possible, even if our's is installed. next if MacOS.version <= :leopard
unless MacOS.version > :leopard && MacOS.version < :sierra && MacOS::CLT.installed? next if MacOS.version >= :sierra
ENV.prepend_path "PATH", Formula["apr-util"].opt_bin next if MacOS::CLT.installed?
ENV.prepend_path "PATH", Formula["apr"].opt_bin ENV.prepend_path "PATH", Formula["apr-util"].opt_bin
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig" ENV.prepend_path "PATH", Formula["apr"].opt_bin
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig" ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig"
end ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig"
end end
def to_dependency def to_dependency