From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D5BF246970E for ; Tue, 21 Jan 2020 14:54:40 +0300 (MSK) From: Serge Petrenko Date: Tue, 21 Jan 2020 14:54:30 +0300 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 0/2] build: link curl with c-ares List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alexander.turenko@tarantool.org Cc: tarantool-patches@dev.tarantool.org The first commit adds c-ares as a submodule and starts using it when building libcurl. This allows to eliminate some problems the curl's default threaded resolver has when DNS server doesn't respond for a long time. The second commit adds curl and c-ares version output to `tarantool --version` and also to `require "tarantool"` table in Lua. This may be useful for debugging purposes. Since the first commit is intended as a bugfix, it should be pushed to all branches, starting from 1.10. However, the second one looks more like a feature so I suggest it be pushed only to master. Changes in v2: - use CMake when building ares instead of configure - minor fixes as per review from @Totktonada https://github.com/tarantool/tarantool/tree/sp/gh-4591-link-curl-with-c-ares-full-ci https://github.com/tarantool/tarantool/issues/4591 Serge Petrenko (2): build: link bundled libcurl with c-ares build: add bundled curl and c-ares to version output .gitmodules | 3 ++ CMakeLists.txt | 6 ++++ cmake/BuildAres.cmake | 71 +++++++++++++++++++++++++++++++++++++++ cmake/BuildLibCURL.cmake | 41 ++++++++++++++++++++-- src/CMakeLists.txt | 3 +- src/lua/init.c | 14 ++++++++ src/main.cc | 6 ++++ src/trivia/config.h.cmake | 4 +++ test/box-py/args.result | 8 +++++ test/box-py/args.test.py | 5 ++- third_party/c-ares | 1 + 11 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 cmake/BuildAres.cmake create mode 160000 third_party/c-ares -- 2.21.0 (Apple Git-122)