diff options
| author | Adam Vandenberg | 2012-10-28 09:16:41 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2012-10-28 09:16:41 -0700 |
| commit | a6dcc41b3bdd0990db97b726aab064d487a93314 (patch) | |
| tree | 846bc2a123f0871ab34ee75d58b3fdb2e5d55e0d /Library/Formula | |
| parent | 55c03df39e221fdcfb42ff355017824a87c09aab (diff) | |
| download | homebrew-a6dcc41b3bdd0990db97b726aab064d487a93314.tar.bz2 | |
Subversion: use correct apr
Backported fix from serf formula.
Closes #14884.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/subversion.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb index 57f9bb696..60bb034aa 100644 --- a/Library/Formula/subversion.rb +++ b/Library/Formula/subversion.rb @@ -71,9 +71,7 @@ class Subversion < Formula depends_on 'pkg-config' => :build - # If Subversion can use the Lion versions of these, please - # open an issue with a patch. Build against Homebrewed versions - # for consistency. - @adamv + # Always build against Homebrew versions instead of system versions for consistency. depends_on 'neon' depends_on 'sqlite' depends_on 'serf' @@ -113,6 +111,10 @@ class Subversion < Formula cause "core.c:1: error: bad value (native) for -march= switch" end if build_perl? or build_python? or build_ruby? + def apr_bin + superbin or "/usr/bin" + end + def install if build_java? unless build.universal? @@ -133,6 +135,7 @@ class Subversion < Formula # Don't mess with Apache modules (since we're not sudo) args = ["--disable-debug", "--prefix=#{prefix}", + "--with-apr=#{apr_bin}", "--with-ssl", "--with-zlib=/usr", "--with-sqlite=#{HOMEBREW_PREFIX}", |