thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fork abseil-cpp to remove dependency on errno@GLIBC_PRIVATE, __pthread_unwind@GLIBC_PRIVATE and to fix shared build.

Browse Source
This commit is contained in:
Vitaly Baranov 2020-11-16 12:45:59 +03:00
parent 7b0f94b5f2
commit a32ed23198
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -202,3 +202,7 @@
[submodule "contrib/xz"]
path = contrib/xz
url = https://github.com/xz-mirror/xz
[submodule "contrib/abseil-cpp"]
path = contrib/abseil-cpp
url = https://github.com/ClickHouse-Extras/abseil-cpp.git
branch = lts_2020_02_25

1
contrib/abseil-cpp vendored Submodule

@ -0,0 +1 @@
Subproject commit 4f3b686f86c3ebaba7e4e926e62a79cb1c659a54

2
contrib/grpc vendored

@ -1 +1 @@
Subproject commit 437d3a4ac93dc153bbd2d34c0c6c9596f1fd6787
Subproject commit 7436366ceb341ba5c00ea29f1645e02a2b70bf93

12
contrib/grpc-cmake/CMakeLists.txt
View File

@ -37,19 +37,13 @@ set(gRPC_SSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)
set(_gRPC_SSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
set(_gRPC_SSL_LIBRARIES ${OPENSSL_LIBRARIES})
# Modify abseil-cpp cmake script to allow building it for ClickHouse.
# Use abseil-cpp from ClickHouse contrib, not from gRPC third_party.
set(gRPC_ABSL_PROVIDER "clickhouse" CACHE STRING "" FORCE)
set(ABSL_ROOT_DIR "${_gRPC_SOURCE_DIR}/third_party/abseil-cpp")
set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
if(NOT EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt")
message(FATAL_ERROR " grpc: submodule third_party/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
endif()
set(_ABSL_ORIG_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(_ABSL_ORIG_BUILD_TESTING ${BUILD_TESTING})
set(BUILD_SHARED_LIBS OFF) # abseil-cpp can't be built correctly as a shared library
set(BUILD_TESTING OFF) # we don't want to build abseil tests
add_subdirectory(${ABSL_ROOT_DIR} "${ClickHouse_BINARY_DIR}/contrib/grpc/third_party/abseil-cpp")
set(BUILD_SHARED_LIBS ${_ABSL_ORIG_BUILD_SHARED_LIBS})
set(BUILD_TESTING ${_ABSL_ORIG_BUILD_TESTING})
add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")
# Choose to build static or shared library for c-ares.
if (MAKE_STATIC_LIBRARIES)