diff options
| author | asaph | 2014-11-01 13:56:52 -0700 |
|---|---|---|
| committer | Mike McQuaid | 2014-12-29 12:11:05 +0000 |
| commit | 565444f75485762fe9ba388fa4996da18ef6810c (patch) | |
| tree | 9e255a571a467c2e4b33003c53dacb7551fed04f | |
| parent | 7bfe070f5618d04b7be0e69a9ef228bebc2e1520 (diff) | |
| download | homebrew-565444f75485762fe9ba388fa4996da18ef6810c.tar.bz2 | |
tomcat-native: add option to use homebrew's APR
Yosemite ships with APR 1.4.8. This new option
allows using newer versions (eg. 1.5.1) from the
homebrew/apache tap.
Closes #33805.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
| -rw-r--r-- | Library/Formula/tomcat-native.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Library/Formula/tomcat-native.rb b/Library/Formula/tomcat-native.rb index 7efb08872..7e7243ba3 100644 --- a/Library/Formula/tomcat-native.rb +++ b/Library/Formula/tomcat-native.rb @@ -12,15 +12,23 @@ class TomcatNative < Formula sha1 "03d417ff8af69aba03c872e3bf7b3de9ca43d44b" => :mountain_lion end + option "with-apr", "Include APR support via Homebrew" + depends_on "libtool" => :build depends_on "tomcat" => :recommended depends_on :java => "1.7" depends_on "openssl" + depends_on "homebrew/apache/apr" => :optional def install cd "jni/native" do + if build.with? 'apr' + apr_path = "#{Formula['homebrew/apache/apr'].prefix}" + else + apr_path = "#{MacOS.sdk_path}/usr" + end system "./configure", "--prefix=#{prefix}", - "--with-apr=#{MacOS.sdk_path}/usr", + "--with-apr=#{apr_path}", "--with-java-home=#{`/usr/libexec/java_home`.chomp}", "--with-ssl=#{Formula["openssl"].prefix}" |