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

curl: remove libressl option.

Browse source
This commit is contained in:
Mike McQuaid 2016-12-19 18:09:32 +00:00
parent 797542c1bf
commit 0194dcdcbf
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Formula/curl.rb
View file

@ -20,8 +20,7 @@ class Curl < Formula
option "with-c-ares", "Build with C-Ares async DNS support"
option "with-gssapi", "Build with GSSAPI/Kerberos authentication support."
option "with-libmetalink", "Build with libmetalink support."
option "with-libressl", "Build with LibreSSL instead of Secure Transport or OpenSSL"
option "with-nghttp2", "Build with HTTP/2 support (requires OpenSSL or LibreSSL)"
option "with-nghttp2", "Build with HTTP/2 support (requires OpenSSL)"
deprecated_option "with-idn" => "with-libidn"
deprecated_option "with-rtmp" => "with-rtmpdump"
@ -30,7 +29,7 @@ class Curl < Formula
# HTTP/2 support requires OpenSSL 1.0.2+ or LibreSSL 2.1.3+ for ALPN Support
# which is currently not supported by Secure Transport (DarwinSSL).
if MacOS.version < :mountain_lion || (build.with?("nghttp2") && build.without?("libressl"))
if MacOS.version < :mountain_lion || build.with?("nghttp2")
depends_on "openssl"
else
option "with-openssl", "Build with OpenSSL instead of Secure Transport"
@ -43,19 +42,9 @@ class Curl < Formula
depends_on "libssh2" => :optional
depends_on "c-ares" => :optional
depends_on "libmetalink" => :optional
depends_on "libressl" => :optional
depends_on "nghttp2" => :optional
def install
# Fail if someone tries to use both SSL choices.
# Long-term, handle conflicting options case in core code.
if build.with?("libressl") && build.with?("openssl")
odie <<-EOS.undent
--with-openssl and --with-libressl are both specified and
curl can only use one at a time.
EOS
end
args = %W[
--disable-debug
--disable-dependency-tracking
@ -66,12 +55,7 @@ class Curl < Formula
# cURL has a new firm desire to find ssl with PKG_CONFIG_PATH instead of using
# "--with-ssl" any more. "when possible, set the PKG_CONFIG_PATH environment
# variable instead of using this option". Multi-SSL choice breaks w/o using it.
if build.with? "libressl"
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["libressl"].opt_lib}/pkgconfig"
args << "--with-ssl=#{Formula["libressl"].opt_prefix}"
args << "--with-ca-bundle=#{etc}/libressl/cert.pem"
args << "--with-ca-path=#{etc}/libressl/certs"
elsif MacOS.version < :mountain_lion || build.with?("openssl") || build.with?("nghttp2")
if MacOS.version < :mountain_lion || build.with?("openssl") || build.with?("nghttp2")
ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["openssl"].opt_lib}/pkgconfig"
args << "--with-ssl=#{Formula["openssl"].opt_prefix}"
args << "--with-ca-bundle=#{etc}/openssl/cert.pem"