From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp16.mail.ru (smtp16.mail.ru [94.100.176.153]) (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 A10534696F5 for ; Tue, 26 May 2020 17:42:43 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Tue, 26 May 2020 17:42:34 +0300 Message-Id: <97dd88360f3a02c3e48e22b41be68a2d305790ad.1590503508.git.avtikhon@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 3/7] build: enable cmake in curl build List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko Changed autoconf tools in Curl build to cmake use for builds where cmake major starts from 3. It was made so because cmake in curl build works only with 3.0 version and above, the following issue found on: CentOS 6,7 Ubuntu 14.04 Issue with curl cmake based build with cmake before 3.0 version: CMake Error at CMakeLists.txt:41 (cmake_minimum_required): CMake 3.0 or higher is required. You are running version 2.8.12.2 For curl cmake buld all autoconf options were ported to cmake configuration call. Also found that CURL cmake configuration file: third_party/curl/lib/CMakeLists.txt has installation part for built libcurl.a library: install(TARGETS ${LIB_NAME} EXPORT ${TARGETS_EXPORT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} where it changes CMAKE_INSTALL_LIBDIR to appropriate name with suffix of the architecture, like: lib lib64 x86_64 Found that find_library routine from the file: cmake/FindLibCURL.cmake returns only 'lib' value and it breaks the building of the depends binaries. To avoid of it the CMAKE_INSTALL_LIBDIR option was set to cmake call: -DCMAKE_INSTALL_LIBDIR=lib Part of #4968 --- cmake/BuildLibCURL.cmake | 240 ++++++++++++++++++++++----------------- 1 file changed, 138 insertions(+), 102 deletions(-) diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake index 5f8b15a63..39566145e 100644 --- a/cmake/BuildLibCURL.cmake +++ b/cmake/BuildLibCURL.cmake @@ -25,10 +25,14 @@ macro(curl_build) set(ASYN_DNS_USED "ares") set(ASYN_DNS_UNUSED "threaded-resolver") set(ASYN_DNS_PATH "=${ARES_INSTALL_DIR}") + set(ENABLE_ARES "ON") + set(CMAKE_FIND_ROOT_PATH "${ARES_INSTALL_DIR}") else() set(ASYN_DNS_USED "threaded-resolver") set(ASYN_DNS_UNUSED "ares") set(ASYN_DNS_PATH "") + set(ENABLE_ARES "OFF") + set(CMAKE_FIND_ROOT_PATH "") endif() set(ENABLED_DNS_OPT "--enable-${ASYN_DNS_USED}${ASYN_DNS_PATH}") @@ -49,108 +53,140 @@ macro(curl_build) endif() include(ExternalProject) - ExternalProject_Add( - bundled-libcurl-project - SOURCE_DIR ${LIBCURL_SOURCE_DIR} - PREFIX ${LIBCURL_INSTALL_DIR} - DOWNLOAD_DIR ${LIBCURL_BINARY_DIR} - TMP_DIR ${LIBCURL_BINARY_DIR}/tmp - STAMP_DIR ${LIBCURL_BINARY_DIR}/stamp - BINARY_DIR ${LIBCURL_BINARY_DIR} - CONFIGURE_COMMAND - cd && ./buildconf && - cd && /configure - # Pass the same toolchain as is used to build - # tarantool itself, because they can be - # incompatible. - CC=${CMAKE_C_COMPILER} - LD=${CMAKE_LINKER} - AR=${CMAKE_AR} - RANLIB=${CMAKE_RANLIB} - NM=${CMAKE_NM} - STRIP=${CMAKE_STRIP} - - # Pass -isysroot= option on Mac OS, see - # above. - # Note: Passing of CPPFLAGS / CFLAGS explicitly - # discards using of corresponsing environment - # variables. - CPPFLAGS=${LIBCURL_CPPFLAGS} - CFLAGS=${LIBCURL_CFLAGS} - - # Pass empty LDFLAGS to discard using of - # corresponding environment variable. - # It is possible that a linker flag assumes that - # some compilation flag is set. We don't pass - # CFLAGS from environment, so we should not do it - # for LDFLAGS too. - LDFLAGS= - - --prefix - --enable-static - --enable-shared - - --with-zlib - ${LIBCURL_OPENSSL_OPT} - --with-ca-fallback - - --without-brotli - --without-gnutls - --without-mbedtls - --without-cyassl - --without-wolfssl - --without-mesalink - --without-nss - --without-ca-bundle - --without-ca-path - --without-libpsl - --without-libmetalink - --without-librtmp - --without-winidn - --without-libidn2 - --without-nghttp2 - --without-ngtcp2 - --without-nghttp3 - --without-quiche - --without-zsh-functions-dir - --without-fish-functions-dir - - ${ENABLED_DNS_OPT} - --enable-http - --enable-proxy - --enable-ipv6 - --enable-unix-sockets - --enable-cookies - --enable-http-auth - --enable-mime - --enable-dateparse - - ${DISABLED_DNS_OPT} - --disable-ftp - --disable-file - --disable-ldap - --disable-ldaps - --disable-rtsp - --disable-dict - --disable-telnet - --disable-tftp - --disable-pop3 - --disable-imap - --disable-smb - --disable-smtp - --disable-gopher - --disable-manual - --disable-sspi - --disable-crypto-auth - --disable-ntlm-wb - --disable-tls-srp - --disable-doh - --disable-netrc - --disable-progress-meter - --disable-dnsshuffle - --disable-alt-svc - BUILD_COMMAND cd && $(MAKE) - INSTALL_COMMAND cd && $(MAKE) install) + if(${CMAKE_MAJOR_VERSION} VERSION_LESS "3") + ExternalProject_Add( + bundled-libcurl-project + SOURCE_DIR ${LIBCURL_SOURCE_DIR} + PREFIX ${LIBCURL_INSTALL_DIR} + DOWNLOAD_DIR ${LIBCURL_BINARY_DIR} + TMP_DIR ${LIBCURL_BINARY_DIR}/tmp + STAMP_DIR ${LIBCURL_BINARY_DIR}/stamp + BINARY_DIR ${LIBCURL_BINARY_DIR} + CONFIGURE_COMMAND + cd && ./buildconf && + cd && /configure + # Pass the same toolchain as is used to build + # tarantool itself, because they can be + # incompatible. + CC=${CMAKE_C_COMPILER} + LD=${CMAKE_LINKER} + AR=${CMAKE_AR} + RANLIB=${CMAKE_RANLIB} + NM=${CMAKE_NM} + STRIP=${CMAKE_STRIP} + + # Pass -isysroot= option on Mac OS, see + # above. + # Note: Passing of CPPFLAGS / CFLAGS explicitly + # discards using of corresponsing environment + # variables. + CPPFLAGS=${LIBCURL_CPPFLAGS} + CFLAGS=${LIBCURL_CFLAGS} + + # Pass empty LDFLAGS to discard using of + # corresponding environment variable. + # It is possible that a linker flag assumes that + # some compilation flag is set. We don't pass + # CFLAGS from environment, so we should not do it + # for LDFLAGS too. + LDFLAGS= + + --prefix + --enable-static + --enable-shared + + --with-zlib + ${LIBCURL_OPENSSL_OPT} + --with-ca-fallback + + --without-brotli + --without-gnutls + --without-mbedtls + --without-cyassl + --without-wolfssl + --without-mesalink + --without-nss + --without-ca-bundle + --without-ca-path + --without-libpsl + --without-libmetalink + --without-librtmp + --without-winidn + --without-libidn2 + --without-nghttp2 + --without-ngtcp2 + --without-nghttp3 + --without-quiche + --without-zsh-functions-dir + --without-fish-functions-dir + + ${ENABLED_DNS_OPT} + --enable-http + --enable-proxy + --enable-ipv6 + --enable-unix-sockets + --enable-cookies + --enable-http-auth + --enable-mime + --enable-dateparse + + ${DISABLED_DNS_OPT} + --disable-ftp + --disable-file + --disable-ldap + --disable-ldaps + --disable-rtsp + --disable-dict + --disable-telnet + --disable-tftp + --disable-pop3 + --disable-imap + --disable-smb + --disable-smtp + --disable-gopher + --disable-manual + --disable-sspi + --disable-crypto-auth + --disable-ntlm-wb + --disable-tls-srp + --disable-doh + --disable-netrc + --disable-progress-meter + --disable-dnsshuffle + --disable-alt-svc + BUILD_COMMAND cd && $(MAKE) + INSTALL_COMMAND cd && $(MAKE) install) + else() + ExternalProject_Add( + bundled-libcurl-project + SOURCE_DIR ${LIBCURL_SOURCE_DIR} + PREFIX ${LIBCURL_INSTALL_DIR} + DOWNLOAD_DIR ${LIBCURL_BINARY_DIR} + TMP_DIR ${LIBCURL_BINARY_DIR}/tmp + STAMP_DIR ${LIBCURL_BINARY_DIR}/stamp + BINARY_DIR ${LIBCURL_BINARY_DIR}/curl + CONFIGURE_COMMAND + cd && cmake + -DCPPFLAGS=${LIBCURL_CPPFLAGS} + -DCFLAGS=${LIBCURL_CFLAGS} + -DLDFLAGS= + -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_INSTALL_PREFIX= + -DBUILD_TESTING=OFF + -DCURL_STATICLIB=ON + -DBUILD_SHARED_LIBS=OFF + -DCMAKE_USE_OPENSSL=ON + -DOPENSSL_ROOT_DIR=${FOUND_OPENSSL_ROOT_DIR} + -DCURL_CA_FALLBACK=ON + -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH} + -DENABLE_ARES=${ENABLE_ARES} + -DHTTP_ONLY=ON + -DCURL_DISABLE_SMB=ON + -DCURL_DISABLE_GOPHER=ON + -DCURL_DISABLE_CRYPTO_AUTH=ON + BUILD_COMMAND cd && $(MAKE) -j + INSTALL_COMMAND cd && $(MAKE) install) + endif() add_library(bundled-libcurl STATIC IMPORTED GLOBAL) set_target_properties(bundled-libcurl PROPERTIES IMPORTED_LOCATION -- 2.17.1