thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the macro ENABLE_CH_BUNDLE_BORINGSSLL to ENABLE_EXTERNAL_OPENSSL

Browse Source
This commit is contained in:
root 2022-09-30 10:35:49 -07:00
parent 51d6611b96
commit bb1771e159
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -495,16 +495,16 @@ endif ()
enable_testing() # Enable for tests without binary
option(ENABLE_CH_BUNDLE_BORINGSSL "Provide the user to allow building of OpenSSL library. By default, uses in-house ClickHouse BoringSSL" ON)
option(ENABLE_EXTERNAL_OPENSSL "Provide the user to allow building of OpenSSL library. By default, uses in-house ClickHouse BoringSSL. It is not recommended and may be insecure" OFF)
message (STATUS "ENABLE_CH_BUNDLE_BORINGSSL: ${ENABLE_CH_BUNDLE_BORINGSSL}")
if (ENABLE_CH_BUNDLE_BORINGSSL)
message (STATUS "ENABLE_EXTERNAL_OPENSSL: ${ENABLE_EXTERNAL_OPENSSL}")
if (NOT ENABLE_EXTERNAL_OPENSSL)
message (STATUS "Uses in-house ClickHouse BoringSSL library")
else ()
message (STATUS "Build and uses OpenSSL library instead of BoringSSL")
endif ()
if (NOT ENABLE_CH_BUNDLE_BORINGSSL)
if (ENABLE_EXTERNAL_OPENSSL)
set(ENABLE_SSL 1)
target_compile_options(global-group INTERFACE "-Wno-deprecated-declarations")
endif ()

2
contrib/CMakeLists.txt vendored
View File

@ -74,7 +74,7 @@ add_contrib (re2-cmake re2)
add_contrib (xz-cmake xz)
add_contrib (brotli-cmake brotli)
add_contrib (double-conversion-cmake double-conversion)
if (ENABLE_CH_BUNDLE_BORINGSSL)
if (NOT ENABLE_EXTERNAL_OPENSSL)
add_contrib (boringssl-cmake boringssl)
else ()
add_contrib (openssl-cmake openssl)

2
contrib/krb5-cmake/CMakeLists.txt
View File

@ -578,7 +578,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
list(APPEND ALL_SRCS "${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c")
endif()
if (NOT ENABLE_CH_BUNDLE_BORINGSSL)
if (ENABLE_EXTERNAL_OPENSSL)
list(REMOVE_ITEM ALL_SRCS "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/aes.c")
list(APPEND ALL_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/aes.c")
endif ()

2
contrib/libpq-cmake/CMakeLists.txt
View File

@ -59,7 +59,7 @@ set(SRCS
add_library(_libpq ${SRCS})
if (NOT ENABLE_CH_BUNDLE_BORINGSSL)
if (ENABLE_EXTERNAL_OPENSSL)
add_definitions(-DHAVE_BIO_METH_NEW)
add_definitions(-DHAVE_HMAC_CTX_NEW)
add_definitions(-DHAVE_HMAC_CTX_FREE)

2
src/CMakeLists.txt
View File

@ -247,7 +247,7 @@ add_object_library(clickhouse_access Access)
add_object_library(clickhouse_backups Backups)
add_object_library(clickhouse_core Core)
add_object_library(clickhouse_core_mysql Core/MySQL)
if (ENABLE_CH_BUNDLE_BORINGSSL)
if (NOT ENABLE_EXTERNAL_OPENSSL)
add_object_library(clickhouse_compression Compression)
else ()
add_headers_and_sources(dbms Compression)

2
src/configure_config.cmake
View File

@ -103,6 +103,6 @@ endif()
if (TARGET ch_contrib::jemalloc)
set(USE_JEMALLOC 1)
endif()
if (ENABLE_CH_BUNDLE_BORINGSSL)
if (NOT ENABLE_EXTERNAL_OPENSSL)
set(USE_BORINGSSL 1)
endif ()