diff options
| author | Dominyk Tiller | 2015-01-09 02:33:48 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-01-09 11:35:18 +0000 |
| commit | 391ed374442cb8f91d9168ccd23f1c97b84686d1 (patch) | |
| tree | 9edb411d3b843c434677cdb26d227a58bf8488d4 /Library/Formula | |
| parent | f145e8e704bf7560182656ce98111b2cb74df4a4 (diff) | |
| download | homebrew-391ed374442cb8f91d9168ccd23f1c97b84686d1.tar.bz2 | |
curl: fix ssl-choice compile
See lengthy comment below for bug.
Closes #35682.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/curl.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Library/Formula/curl.rb b/Library/Formula/curl.rb index dfda21e8a..4e860b792 100644 --- a/Library/Formula/curl.rb +++ b/Library/Formula/curl.rb @@ -1,5 +1,3 @@ -require "formula" - class Curl < Formula homepage "http://curl.haxx.se/" url "http://curl.haxx.se/download/curl-7.40.0.tar.bz2" @@ -56,13 +54,19 @@ class Curl < Formula args = %W[ --disable-debug --disable-dependency-tracking + --disable-silent-rules --prefix=#{prefix} ] + # 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 or build.with? "openssl" + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["openssl"].opt_prefix}/lib/pkgconfig" args << "--with-ssl=#{Formula["openssl"].opt_prefix}" args << "--with-ca-bundle=#{etc}/openssl/cert.pem" elsif build.with? "libressl" + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["libressl"].opt_prefix}/lib/pkgconfig" args << "--with-ssl=#{Formula["libressl"].opt_prefix}" args << "--with-ca-bundle=#{etc}/libressl/cert.pem" else |