From 64eff512b5370423df2d0c9ca0ad94da9a73a0ed Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 2 Mar 2016 05:56:47 -0800 Subject: [PATCH] Mac: Fix bug in script to build curl-7.47.1 with ssl v2 disabled. --- mac_build/buildcurl.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index d770602153..1e1f8aa5e7 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -114,9 +114,10 @@ if [ $? -ne 0 ]; then return 1; fi echo "" ## Work around a conflict with OpenSSL-1.0.2g -# Patch build/osx/setup/cocoa/include/wx/setup.h -if [ ! -f lib/curl_config.h.orig ]; then - cat >> /tmp/scurl_config_h_diff << ENDOFFILE +# Patch lib/curl_config.h +rm -f lib/curl_config.h.orig ] + +cat >> /tmp/scurl_config_h_diff << ENDOFFILE --- lib/curl_config.h +++ lib/curl_config_patched.h @@ -602,2 +602,2 @@ @@ -124,11 +125,9 @@ if [ ! -f lib/curl_config.h.orig ]; then +/* #undef HAVE_SSLV2_CLIENT_METHOD 1 */ ENDOFFILE - patch -bfi /tmp/scurl_config_h_diff lib/curl_config.h - rm -f /tmp/scurl_config_h_diff -else - echo "lib/curl_config.h already patched" -fi + +patch -bfi /tmp/scurl_config_h_diff lib/curl_config.h +rm -f /tmp/scurl_config_h_diff echo ""