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

AprRequirement's default formula should be apr-util

Browse Source 
This matches the recommendation in the message.
This commit is contained in:
Jack Nagel 2015-02-02 00:39:04 -05:00
parent 5e854164a7
commit 12e4602a3b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/requirements/apr_dependency.rb
View File

@ -2,15 +2,16 @@ require "requirement"
class AprDependency < Requirement
fatal true
default_formula "apr"
default_formula "apr-util"
satisfy { MacOS::CLT.installed? || Formula["apr"].installed? }
env do
unless MacOS::CLT.installed?
ENV.prepend_path "PATH", "#{Formula["apr-util"].opt_prefix}/bin"
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_prefix}/libexec/lib/pkgconfig"
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_prefix}/libexec/lib/pkgconfig"
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
end