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

apr_requirement: favour system as much as possible

Browse Source
This commit is contained in:
Dominyk Tiller 2016-10-05 01:45:24 +01:00
parent b6ecaa26f5
commit fcc9cfa6ae
No known key found for this signature in database
GPG Key ID: FE19AEFCF658C6F6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,10 +12,13 @@ class AprRequirement < Requirement
end end
env do env do
ENV.prepend_path "PATH", Formula["apr-util"].opt_bin # Prefer system Apr as much as possible, even if our's is installed.
ENV.prepend_path "PATH", Formula["apr"].opt_bin unless MacOS.version > :leopard && MacOS.version < :sierra && MacOS::CLT.installed?
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig" ENV.prepend_path "PATH", Formula["apr-util"].opt_bin
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig" 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
end end
def to_dependency def to_dependency