wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

subversion: simplify apr logic

Browse source 
Closes #7462.

Signed-off-by: ilovezfs <ilovezfs@icloud.com>
This commit is contained in:
Dominyk Tiller 2016-12-02 03:18:19 +00:00 committed by ilovezfs
parent 38e0399735
commit a4295298e4
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Formula/subversion.rb
View file

@ -4,6 +4,7 @@ class Subversion < Formula
url "https://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.9.5.tar.bz2"
mirror "https://archive.apache.org/dist/subversion/subversion-1.9.5.tar.bz2"
sha256 "8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5"
revision 1
bottle do
sha256 "c94de8b8fd132839a839a7a42770a94b3fe99a59ac40c4073b3e2cbc2e8af000" => :sierra
@ -22,17 +23,8 @@ class Subversion < Formula
option "with-gpg-agent", "Build with support for GPG Agent"
depends_on "pkg-config" => :build
# macOS Sierra ships the APR libraries & headers, but has removed the
# apr-1-config & apu-1-config executables which serf demands to find
# those elements. We may need to adopt a broader solution if this problem
# expands, but currently subversion is the only breakage as a result.
if MacOS.version >= :sierra
depends_on "apr-util"
depends_on "apr"
else
depends_on "apr" => :build
end
# Always build against Homebrew versions instead of system versions for consistency.
depends_on "sqlite"
@ -88,15 +80,13 @@ class Subversion < Formula
ENV.universal_binary if build.universal?
# scons ignores our compiler and flags unless explicitly passed
args = %W[PREFIX=#{serf_prefix} GSSAPI=/usr CC=#{ENV.cc}
args = %W[
PREFIX=#{serf_prefix} GSSAPI=/usr CC=#{ENV.cc}
CFLAGS=#{ENV.cflags} LINKFLAGS=#{ENV.ldflags}
OPENSSL=#{Formula["openssl"].opt_prefix}]
if MacOS.version >= :sierra || !MacOS::CLT.installed?
args << "APR=#{Formula["apr"].opt_prefix}"
args << "APU=#{Formula["apr-util"].opt_prefix}"
end
OPENSSL=#{Formula["openssl"].opt_prefix}
APR=#{Formula["apr"].opt_prefix}
APU=#{Formula["apr-util"].opt_prefix}
]
scons(*args)
scons "install"
end
@ -126,6 +116,9 @@ class Subversion < Formula
--enable-optimize
--with-zlib=/usr
--with-sqlite=#{Formula["sqlite"].opt_prefix}
--with-apr=#{Formula["apr"].opt_prefix}
--with-apr-util=#{Formula["apr-util"].opt_prefix}
--with-apxs=no
--with-serf=#{serf_prefix}
--disable-mod-activation
--disable-nls
@ -136,15 +129,6 @@ class Subversion < Formula
args << "--enable-javahl" << "--without-jikes" if build.with? "java"
args << "--without-gpg-agent" if build.without? "gpg-agent"
if MacOS::CLT.installed? && MacOS.version < :sierra
args << "--with-apr=/usr"
args << "--with-apr-util=/usr"
else
args << "--with-apr=#{Formula["apr"].opt_prefix}"
args << "--with-apr-util=#{Formula["apr-util"].opt_prefix}"
args << "--with-apxs=no"
end
if build.with? "ruby"
args << "--with-ruby-sitedir=#{lib}/ruby"
# Peg to system Ruby