Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

curl: remove options. #36066

Closed
wants to merge 1 commit into from
Closed

curl: remove options. #36066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 2 additions & 29 deletions Formula/curl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,16 @@ class Curl < Formula

keg_only :provided_by_macos

option "with-rtmpdump", "Build with RTMP support"
option "with-libssh2", "Build with scp and sftp support"
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-nghttp2", "Build with HTTP/2 support (requires OpenSSL)"

deprecated_option "with-rtmp" => "with-rtmpdump"
deprecated_option "with-ssh" => "with-libssh2"
deprecated_option "with-ares" => "with-c-ares"

# 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")
if MacOS.version < :mountain_lion
depends_on "openssl"
else
option "with-openssl", "Build with OpenSSL instead of Secure Transport"
depends_on "openssl" => :optional
end

depends_on "pkg-config" => :build
depends_on "c-ares" => :optional
depends_on "libmetalink" => :optional
depends_on "libssh2" => :optional
depends_on "nghttp2" => :optional
depends_on "rtmpdump" => :optional

def install
system "./buildconf" if build.head?
Expand All @@ -65,7 +49,7 @@ def install
# 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 MacOS.version < :mountain_lion || build.with?("openssl") || build.with?("nghttp2")
if MacOS.version < :mountain_lion || build.with?("openssl")
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"
Expand All @@ -76,17 +60,6 @@ def install
args << "--without-ca-path"
end

args << (build.with?("libssh2") ? "--with-libssh2" : "--without-libssh2")
args << (build.with?("libmetalink") ? "--with-libmetalink" : "--without-libmetalink")
args << (build.with?("gssapi") ? "--with-gssapi" : "--without-gssapi")
args << (build.with?("rtmpdump") ? "--with-librtmp" : "--without-librtmp")

if build.with? "c-ares"
args << "--enable-ares=#{Formula["c-ares"].opt_prefix}"
else
args << "--disable-ares"
end

system "./configure", *args
system "make", "install"
system "make", "install", "-C", "scripts"
Expand Down