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

Merge pull request #1227 from DomT4/apr

Browse Source 
apr_requirement: use Homebrew's Apr for Sierra
This commit is contained in:
Mike McQuaid 2016-10-12 11:38:57 +01:00 committed by GitHub
commit a812e95417
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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