git: curl dependency is sometimes mandatory.

As because it's sometimes mandatory we also no longer need to have an
HTTP mirror for Git.
This commit is contained in:
Mike McQuaid 2017-09-16 13:08:03 +01:00
parent 996fbb2400
commit 49be83e84a

View file

@ -2,7 +2,6 @@ class Git < Formula
desc "Distributed revision control system"
homepage "https://git-scm.com"
url "https://www.kernel.org/pub/software/scm/git/git-2.14.1.tar.xz"
mirror "http://tux.rainside.sk/pub/software/scm/git/git-2.14.1.tar.xz"
sha256 "6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6"
head "https://github.com/git/git.git", :shallow => false
@ -15,22 +14,30 @@ class Git < Formula
option "with-blk-sha1", "Compile with the block-optimized SHA1 implementation"
option "without-completions", "Disable bash/zsh completions from 'contrib' directory"
option "with-openssl", "Build with Homebrew's OpenSSL instead of using CommonCrypto"
option "with-curl", "Use Homebrew's version of cURL library"
option "with-subversion", "Use Homebrew's version of SVN"
option "with-persistent-https", "Build git-remote-persistent-https from 'contrib' directory"
deprecated_option "with-brewed-openssl" => "with-openssl"
deprecated_option "with-brewed-curl" => "with-curl"
deprecated_option "with-brewed-svn" => "with-subversion"
deprecated_option "with-pcre" => "with-pcre2"
depends_on "pcre2" => :optional
depends_on "gettext" => :optional
depends_on "openssl" => :optional
depends_on "curl" => :optional
depends_on "go" => :build if build.with? "persistent-https"
if MacOS.version < :yosemite
depends_on "openssl"
depends_on "curl"
else
deprecated_option "with-brewed-openssl" => "with-openssl"
deprecated_option "with-brewed-curl" => "with-curl"
option "with-openssl", "Build with Homebrew's OpenSSL instead of using CommonCrypto"
option "with-curl", "Use Homebrew's version of cURL library"
depends_on "openssl" => :optional
depends_on "curl" => :optional
end
if build.with? "subversion"
depends_on "subversion"
depends_on :perl => ["5.6", :recommended]
@ -100,7 +107,7 @@ class Git < Formula
LDFLAGS=#{ENV.ldflags}
]
if build.with? "openssl"
if build.with?("openssl") || MacOS.version < :yosemite
openssl_prefix = Formula["openssl"].opt_prefix
args += %W[NO_APPLE_COMMON_CRYPTO=1 OPENSSLDIR=#{openssl_prefix}]
else
@ -169,7 +176,9 @@ class Git < Formula
# To avoid this feature hooking into the system OpenSSL, remove it.
# If you need it, install git --with-openssl.
rm "#{libexec}/git-core/git-imap-send" if build.without? "openssl"
if MacOS.version >= :yosemite && build.without?("openssl")
rm "#{libexec}/git-core/git-imap-send"
end
# This is only created when building against system Perl, but it isn't
# purged by Homebrew's post-install cleaner because that doesn't check