[Tarantool-patches] [tarantool-patches] Re: [PATCH] build: fix OpenSSL linking problems on FreeBSD
Alexander Turenko
alexander.turenko at tarantool.org
Sat Oct 26 03:43:30 MSK 2019
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=<SDK_PATH> 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=<SDK_PATH> 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 "")
More information about the Tarantool-patches
mailing list