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

fix builds

Browse Source
This commit is contained in:
Kirill Nikiforov 2024-09-19 04:17:11 +04:00
parent dcfcfd08c6
commit 4ecb5c0442
No known key found for this signature in database
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -214,7 +214,8 @@
url = https://github.com/google/libprotobuf-mutator
[submodule "contrib/sysroot"]
path = contrib/sysroot
url = https://github.com/ClickHouse/sysroot
url = https://github.com/allmazz/sysroot.git
branch = add-libresolv
[submodule "contrib/nlp-data"]
path = contrib/nlp-data
url = https://github.com/ClickHouse/nlp-data
@ -368,8 +369,7 @@
url = https://github.com/ClickHouse/mongo-cxx-driver.git
[submodule "contrib/mongo-c-driver"]
path = contrib/mongo-c-driver
url = https://github.com/allmazz/mongo-c-driver.git
branch = cherry-pick/initialization-freeze-fix
url = https://github.com/ClickHouse/mongo-c-driver.git
[submodule "contrib/numactl"]
path = contrib/numactl
url = https://github.com/ClickHouse/numactl.git

2
cmake/linux/toolchain-riscv64.cmake
View File

@ -11,7 +11,7 @@ set (CMAKE_ASM_COMPILER_TARGET "riscv64-linux-gnu")
set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-riscv64")
set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/riscv64-linux-gnu/libc")
set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")

2
contrib/mongo-c-driver vendored

@ -1 +1 @@
Subproject commit 788f0c9846a3aeab44cc882dfcff65f97c2103c8
Subproject commit 5d69d851264b67328159a085c0ffc07bf10beb18

5
contrib/mongo-c-driver-cmake/CMakeLists.txt
View File

@ -153,7 +153,10 @@ add_library(ch_contrib::libmongoc ALIAS _libmongoc)
target_include_directories(_libmongoc SYSTEM PUBLIC ${LIBMONGOC_SOURCE_DIR} ${COMMON_SOURCE_DIR} ${UTF8PROC_SOURCE_DIR} ${UTHASH_SOURCE_DIR})
target_include_directories(_libmongoc SYSTEM PRIVATE ${LIBMONGOC_SOURCE_DIR}/mongoc ${UTHASH_SOURCE_DIR})
target_compile_definitions(_libmongoc PRIVATE MONGOC_COMPILATION)
target_link_libraries(_libmongoc ch_contrib::libbson ch_contrib::c-ares ch_contrib::zstd resolv)
target_link_libraries(_libmongoc ch_contrib::libbson ch_contrib::c-ares ch_contrib::zstd)
if (NOT OS_FREEBSD AND NOT USE_MUSL)
target_link_libraries(_libmongoc resolv)
endif()
if(ENABLE_SSL)
target_link_libraries(_libmongoc OpenSSL::SSL)
endif()