From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 45B5F442A00 for ; Sat, 26 Oct 2019 04:02:22 +0300 (MSK) From: Alexander Turenko Date: Sat, 26 Oct 2019 04:01:57 +0300 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 0/2] Fix build problems on FreeBSD and Mac OS List-Id: Tarantool development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Munkin Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org This patchset fixes two problems with building of tarantool on different OSes: - https://github.com/tarantool/tarantool/issues/4490 "FreeBSD compilation failing due to curl dependencies" - https://github.com/tarantool/tarantool/issues/4587 "build: failed to link on MacOS with GNU binutils in PATH" The first patch handles several problems with our libcurl build that we observes on FreeBSD. In brief, it ensures that we use the same OpenSSL library and headers as for tarantool's crypto module as well as for libcurl build and also ensures that the headers and the library are from the same 'prefix' directory. Those changes reveal several other build problems (including one on Mac OS) and I fixed them within this patch. The second patch fixes the problem on Mac OS when different toolchains can be choosen for building tarantool, libluajit.a and libcurl.a. It is not a side effect of the first patch: current master is affected too. I already sent the first patch, but decided to investigate the new problem on Mac OS and base the fix on the work that was done for FreeBSD. The first patch got LGTMs from Igor M. and Alexander Tikh. and was not changed except one comment that clarifies why LIBCURL_CFLAGS / LIBCURL_CPPFLAGS contain only -isysroot= option. The patchset is here: https://github.com/tarantool/tarantool/commits/Totktonada/gh-4490-fix-freebsd-openssl-linking-problems-full-ci Alexander Turenko (2): build: fix OpenSSL linking problems on FreeBSD build: pass path to toolchain for luajit and curl cmake/BuildLibCURL.cmake | 42 +++++++++++++++++++++++++++++++++------- cmake/compiler.cmake | 4 +++- cmake/luajit.cmake | 12 ++++++++++++ cmake/os.cmake | 35 +++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 8 deletions(-) -- 2.22.0