From 9251fb803afeb8109aaa612f4d5252f1d787fd50 Mon Sep 17 00:00:00 2001 From: Ivan <5627721+abyss7@users.noreply.github.com> Date: Mon, 10 Feb 2020 15:41:13 +0300 Subject: [PATCH] Enable OpenSSL support in Curl (#9039) * Enable OpenSSL support in Curl * Define macro CURL_CA_BUNDLE --- contrib/curl-cmake/CMakeLists.txt | 2 ++ contrib/curl-cmake/curl_config.h | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/contrib/curl-cmake/CMakeLists.txt b/contrib/curl-cmake/CMakeLists.txt index 07a689adb6..d9805612ff 100644 --- a/contrib/curl-cmake/CMakeLists.txt +++ b/contrib/curl-cmake/CMakeLists.txt @@ -146,3 +146,5 @@ target_compile_definitions(curl PRIVATE HAVE_CONFIG_H BUILDING_LIBCURL CURL_HIDD target_include_directories(curl PUBLIC ${CURL_DIR}/include ${CURL_DIR}/lib .) target_compile_definitions(curl PRIVATE OS="${CMAKE_SYSTEM_NAME}") + +target_link_libraries(curl PRIVATE ssl) diff --git a/contrib/curl-cmake/curl_config.h b/contrib/curl-cmake/curl_config.h index c8f8e1b658..1efdd88600 100644 --- a/contrib/curl-cmake/curl_config.h +++ b/contrib/curl-cmake/curl_config.h @@ -1,3 +1,4 @@ +#define CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" #define CURL_DISABLE_FTP #define CURL_DISABLE_TFTP #define CURL_DISABLE_LDAP @@ -9,9 +10,14 @@ #define SIZEOF_CURL_OFF_T 8 #define SIZEOF_SIZE_T 8 +#define HAVE_ALARM #define HAVE_FCNTL_O_NONBLOCK +#define HAVE_GETADDRINFO #define HAVE_LONGLONG #define HAVE_POLL_FINE +#define HAVE_SIGACTION +#define HAVE_SIGNAL +#define HAVE_SIGSETJMP #define HAVE_SOCKET #define HAVE_STRUCT_TIMEVAL @@ -34,5 +40,11 @@ #define HAVE_ERRNO_H #define HAVE_FCNTL_H #define HAVE_NETDB_H +#define HAVE_NETINET_IN_H +#define HAVE_SETJMP_H #define HAVE_SYS_STAT_H #define HAVE_UNISTD_H + +#define ENABLE_IPV6 +#define USE_OPENSSL +#define USE_THREADS_POSIX