diff options
| author | Mikko Lehtonen | 2014-06-16 14:52:01 +0300 | 
|---|---|---|
| committer | Mike McQuaid | 2014-06-18 10:56:47 +0100 | 
| commit | 218e609eaa19a42ac5f20708ae07b24710a5d352 (patch) | |
| tree | 8c602c5e38c1e133ed7c84b0e894c40ee89db0e1 /Library/Formula/git.rb | |
| parent | 22cc48e5ffce6ef7dcd75646b577728147cc3a3c (diff) | |
| download | homebrew-218e609eaa19a42ac5f20708ae07b24710a5d352.tar.bz2 | |
git: add --with-brewed-svn option.
Fixes #29641.
Fixes #30255.
Diffstat (limited to 'Library/Formula/git.rb')
| -rw-r--r-- | Library/Formula/git.rb | 6 | 
1 files changed, 5 insertions, 1 deletions
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  | 
