From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 029A32457C for ; Wed, 3 Jul 2019 09:38:04 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oJ24vr9I5fSj for ; Wed, 3 Jul 2019 09:38:03 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id B29292457A for ; Wed, 3 Jul 2019 09:38:03 -0400 (EDT) Date: Wed, 3 Jul 2019 16:37:40 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH v1 1/2] Reinstall curl to 7.65.0 version on OSX Message-ID: <20190703133720.f6mfzeikmbwnfjjm@tkn_work_nb> References: <99f6e0e229388f03b5711d3c023c7cebe58208cf.1562158794.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <99f6e0e229388f03b5711d3c023c7cebe58208cf.1562158794.git.avtikhon@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: "Alexander V. Tikhonov" Cc: tarantool-patches@freelists.org Don't get why do you install 'curl-openssl', while before we install 'curl' brew package. Please, elaborate this point. WBR, Alexander Turenko. On Wed, Jul 03, 2019 at 04:01:50PM +0300, Alexander V. Tikhonov wrote: > At OSX images brew now contains curl-7.65.1 which affected > by curl/curl#3995 (this problem leads to segfaults). The next > version is not released yet. The current commit downgrades the > curl version to 7.65.0. > > Close #4288 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/curl-downgrade > Issue: https://github.com/tarantool/tarantool/issues/4288 > > .travis.mk | 17 +++++++++++++++++ > cmake/os.cmake | 7 ++++++- > 2 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/.travis.mk b/.travis.mk > index 6d0c42207..8ad4b0566 100644 > --- a/.travis.mk > +++ b/.travis.mk > @@ -51,6 +51,23 @@ deps_osx: > brew update > brew install openssl readline curl icu4c --force > python2 -V || brew install python2 --force > + ################################################### > + # Temporary workaround to curl version from > + # issue #4288 to downgrade from 7.65.1 to 7.65.0: > + # TODO: remove the workaround after 7.65.2 released > + # Warning message from brew installer: > + # curl-openssl is keg-only, which means it was not symlinked into /usr/local, > + # because macOS already provides this software and installing another version in > + # parallel can cause all kinds of trouble. > + export PATH="/usr/local/opt/curl-openssl/bin:${PATH}" > + export LDFLAGS="-L/usr/local/opt/curl-openssl/lib" > + export CPPFLAGS="-I/usr/local/opt/curl-openssl/include" > + echo "Curl version before its downgrade:" > + curl -V > + brew reinstall https://raw.githubusercontent.com/Homebrew/homebrew-core/e47f3e2682fa3d8a6ee58ded40718a1326e08a6d/Formula/curl-openssl.rb > + echo "Curl version after its downgrade:" > + curl -V > + ################################################### > curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python > pip install -r test-run/requirements.txt > > diff --git a/cmake/os.cmake b/cmake/os.cmake > index ea581108b..d04682f80 100644 > --- a/cmake/os.cmake > +++ b/cmake/os.cmake > @@ -95,7 +95,12 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") > endif() > > # Detecting CURL > - execute_process(COMMAND ${HOMEBREW_EXECUTABLE} --prefix curl > + if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") > + set(CURL_NAME "curl-openssl") > + else() > + set(CURL_NAME "curl") > + endif() > + execute_process(COMMAND ${HOMEBREW_EXECUTABLE} --prefix ${CURL_NAME} > OUTPUT_VARIABLE HOMEBREW_CURL > OUTPUT_STRIP_TRAILING_WHITESPACE) > if (DEFINED HOMEBREW_CURL) > -- > 2.17.1 >