From dd8950d0a971fdc206c4e0f90c2f51b6b1adc571 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Thu, 25 Dec 2014 22:43:29 +0000 Subject: [PATCH] apr 1.5.1 (new formula) Migrates Apr from Homebrew/Apache to Homebrew/Homebrew, adds a requirement to allow people to use this Apr instead of requiring people to download the full CLT package. Tested against subversion with consistent success. Closes Homebrew/homebrew#34987. Signed-off-by: Mike McQuaid --- .../Homebrew/requirements/apr_dependency.rb | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Library/Homebrew/requirements/apr_dependency.rb diff --git a/Library/Homebrew/requirements/apr_dependency.rb b/Library/Homebrew/requirements/apr_dependency.rb new file mode 100644 index 0000000000..f996b5b79d --- /dev/null +++ b/Library/Homebrew/requirements/apr_dependency.rb @@ -0,0 +1,39 @@ +require "requirement" + +class AprDependency < Requirement + fatal true + default_formula "apr" + + 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" + end + end + + def message + message = <<-EOS.undent + Due to packaging problems on Apple's part, software that compiles + against APR requires the standalone Command Line Tools. + EOS + if MacOS.version >= :mavericks + message += <<-EOS.undent + Either + `brew install apr-util` + or + `xcode-select --install` + to install APR. + EOS + else + message += <<-EOS.undent + The standalone package can be obtained from + https://developer.apple.com/downloads/, + or it can be installed via Xcode's preferences. + Or you can `brew install apr-util`. + EOS + end + end +end