Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Commit

Permalink
Subversion: use correct apr
Browse files Browse the repository at this point in the history
Backported fix from serf formula.

Closes #14884.
  • Loading branch information
adamv committed Oct 28, 2012
1 parent 55c03df commit a6dcc41
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Library/Formula/subversion.rb
Expand Up @@ -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'
Expand Down Expand Up @@ -113,6 +111,10 @@ def patches
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?
Expand All @@ -133,6 +135,7 @@ def install
# 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}",
Expand Down

0 comments on commit a6dcc41

Please sign in to comment.