From 218e609eaa19a42ac5f20708ae07b24710a5d352 Mon Sep 17 00:00:00 2001 From: Mikko Lehtonen Date: Mon, 16 Jun 2014 14:52:01 +0300 Subject: git: add --with-brewed-svn option. Fixes #29641. Fixes #30255. --- Library/Formula/git.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Library/Formula') diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb index 88279e79d..9a6df0431 100644 --- a/Library/Formula/git.rb +++ b/Library/Formula/git.rb @@ -28,6 +28,7 @@ class Git < Formula option 'without-completions', 'Disable bash/zsh completions from "contrib" directory' option 'with-brewed-openssl', "Build with Homebrew OpenSSL instead of the system version" option 'with-brewed-curl', "Use Homebrew's version of cURL library" + option 'with-brewed-svn', "Use Homebrew's version of SVN" option 'with-persistent-https', 'Build git-remote-persistent-https from "contrib" directory' depends_on 'pcre' => :optional @@ -35,6 +36,7 @@ class Git < Formula depends_on 'openssl' if build.with? 'brewed-openssl' depends_on 'curl' if build.with? 'brewed-curl' depends_on 'go' => :build if build.with? 'persistent-https' + depends_on 'subversion' => 'perl' if build.with? 'brewed-svn' def install # If these things are installed, tell Git build system to not use them @@ -45,7 +47,9 @@ class Git < Formula ENV['PYTHON_PATH'] = which 'python' ENV['PERL_PATH'] = which 'perl' - if MacOS.version >= :mavericks + if build.with? 'brewed-svn' + ENV["PERLLIB_EXTRA"] = "#{Formula["subversion"].prefix}/Library/Perl/5.16/darwin-thread-multi-2level" + elsif MacOS.version >= :mavericks ENV["PERLLIB_EXTRA"] = %W{ #{MacOS.active_developer_dir} /Library/Developer/CommandLineTools -- cgit v1.2.3