From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [94.100.177.112]) (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 E3D76401A41 for ; Sat, 26 Oct 2019 03:43:40 +0300 (MSK) Date: Sat, 26 Oct 2019 03:43:30 +0300 From: Alexander Turenko Message-ID: <20191026004330.z4ydq7xflko5qrrh@tkn_work_nb> References: <20191016221939.i75hojrafnljgbec@tkn_work_nb> <20191017115624.GA16357@tarantool.org> <1571365805.179773702@f496.i.mail.ru> <20191018060124.zvu3d5eixvqiuyta@tkn_work_nb> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191018060124.zvu3d5eixvqiuyta@tkn_work_nb> Subject: Re: [Tarantool-patches] [tarantool-patches] Re: [PATCH] build: fix OpenSSL linking problems on FreeBSD List-Id: Tarantool development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Tikhonov Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org I'll resend the patch as a patchset of two patches: it will handle the following build problems on FreeBSD and Mac OS: - 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" I'll do one change for this patch: > > >> + # Pass -isysroot= option on Mac OS to a preprocessor > > >> + # and a C compiler to find header files installed with an SDK. > > >> + set(LIBCURL_CPPFLAGS "") > > >> + set(LIBCURL_CFLAGS "") > > >> + if (TARGET_OS_DARWIN AND NOT "${CMAKE_OSX_SYSROOT}" STREQUAL "") > > >> + set(LIBCURL_CPPFLAGS "${LIBCURL_CPPFLAGS} ${CMAKE_C_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}") > > >> + set(LIBCURL_CFLAGS "${LIBCURL_CFLAGS} ${CMAKE_C_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}") > > >> endif() Added the following paragraph here. | diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake | index 336c14c88..12062ec8b 100644 | --- a/cmake/BuildLibCURL.cmake | +++ b/cmake/BuildLibCURL.cmake | @@ -21,6 +21,11 @@ macro(curl_build) | | # Pass -isysroot= option on Mac OS to a preprocessor | # and a C compiler to find header files installed with an SDK. | + # | + # The idea here is to don't pass all compiler/linker options | + # that is set for tarantool, but only a subset that is | + # necessary for choosen toolchain, and let curl's configure | + # script set options that are appropriate for libcurl. | set(LIBCURL_CPPFLAGS "") | set(LIBCURL_CFLAGS "") | if (TARGET_OS_DARWIN AND NOT "${CMAKE_OSX_SYSROOT}" STREQUAL "")