From 4ecb5c044242737c93b1f0b223156905db67c592 Mon Sep 17 00:00:00 2001 From: Kirill Nikiforov Date: Thu, 19 Sep 2024 04:17:11 +0400 Subject: [PATCH] fix builds --- .gitmodules | 6 +++--- cmake/linux/toolchain-riscv64.cmake | 2 +- contrib/mongo-c-driver | 2 +- contrib/mongo-c-driver-cmake/CMakeLists.txt | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 484da48d2cd..43fdfaa0f72 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/cmake/linux/toolchain-riscv64.cmake b/cmake/linux/toolchain-riscv64.cmake index f04f70dfe74..ae5a38f08eb 100644 --- a/cmake/linux/toolchain-riscv64.cmake +++ b/cmake/linux/toolchain-riscv64.cmake @@ -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}") diff --git a/contrib/mongo-c-driver b/contrib/mongo-c-driver index 788f0c9846a..5d69d851264 160000 --- a/contrib/mongo-c-driver +++ b/contrib/mongo-c-driver @@ -1 +1 @@ -Subproject commit 788f0c9846a3aeab44cc882dfcff65f97c2103c8 +Subproject commit 5d69d851264b67328159a085c0ffc07bf10beb18 diff --git a/contrib/mongo-c-driver-cmake/CMakeLists.txt b/contrib/mongo-c-driver-cmake/CMakeLists.txt index f45cbe2d287..23e470c5f8d 100644 --- a/contrib/mongo-c-driver-cmake/CMakeLists.txt +++ b/contrib/mongo-c-driver-cmake/CMakeLists.txt @@ -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()