diff options
Diffstat (limited to 'databases/clickhouse/files')
5 files changed, 20 insertions, 73 deletions
diff --git a/databases/clickhouse/files/patch-PreLoad.cmake b/databases/clickhouse/files/patch-PreLoad.cmake index bd030f480214..de1b05af5747 100644 --- a/databases/clickhouse/files/patch-PreLoad.cmake +++ b/databases/clickhouse/files/patch-PreLoad.cmake @@ -1,12 +1,19 @@ ---- PreLoad.cmake.orig 2023-04-26 21:51:24 UTC +--- PreLoad.cmake.orig 2024-09-26 19:15:26 UTC +++ PreLoad.cmake -@@ -15,12 +15,17 @@ endif() +@@ -15,12 +15,24 @@ endif() endif () endif() +# Default toolchain - this is needed to avoid dependency on OS files. -+execute_process(COMMAND uname -s OUTPUT_VARIABLE OS) -+execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH) ++execute_process(COMMAND uname -s ++ OUTPUT_VARIABLE OS ++ COMMAND_ERROR_IS_FATAL ANY ++) ++execute_process(COMMAND uname -m ++ OUTPUT_VARIABLE ARCH ++ COMMAND_ERROR_IS_FATAL ANY ++) ++ + # Check if environment is polluted. -if (NOT "$ENV{CFLAGS}" STREQUAL "" @@ -20,14 +27,20 @@ # if $ENV message("CFLAGS: $ENV{CFLAGS}") -@@ -49,10 +54,6 @@ endif() +@@ -49,16 +61,6 @@ endif() Note: if you don't like this behavior, you can manually edit the cmake files, but please don't complain to developers.") endif() - -# Default toolchain - this is needed to avoid dependency on OS files. --execute_process(COMMAND uname -s OUTPUT_VARIABLE OS) --execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH) +-execute_process(COMMAND uname -s +- OUTPUT_VARIABLE OS +- COMMAND_ERROR_IS_FATAL ANY +-) +-execute_process(COMMAND uname -m +- OUTPUT_VARIABLE ARCH +- COMMAND_ERROR_IS_FATAL ANY +-) # By default, prefer clang on Linux # But note, that you still may change the compiler with -DCMAKE_C_COMPILER/-DCMAKE_CXX_COMPILER. diff --git a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake deleted file mode 100644 index 796afaca4ac6..000000000000 --- a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake +++ /dev/null @@ -1,16 +0,0 @@ ---- cmake/freebsd/default_libs.cmake.orig 2023-04-26 21:51:24 UTC -+++ cmake/freebsd/default_libs.cmake -@@ -1,12 +1,6 @@ set (DEFAULT_LIBS "-nodefaultlibs") - set (DEFAULT_LIBS "-nodefaultlibs") - --if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64") -- execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libclang_rt.builtins-x86_64.a OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE) --else () -- execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libclang_rt.builtins-${CMAKE_SYSTEM_PROCESSOR}.a OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE) --endif () -- --set (DEFAULT_LIBS "${DEFAULT_LIBS} ${BUILTINS_LIBRARY} ${COVERAGE_OPTION} -lc -lm -lrt -lpthread") -+set (DEFAULT_LIBS "${DEFAULT_LIBS} ${BUILTINS_LIBRARY} ${COVERAGE_OPTION} -lc -lm -lrt -lpthread -lcompiler_rt -lprocstat") - - message(STATUS "Default libraries: ${DEFAULT_LIBS}") - diff --git a/databases/clickhouse/files/patch-cmake_freebsd_toolchain-x86__64.cmake b/databases/clickhouse/files/patch-cmake_freebsd_toolchain-x86__64.cmake deleted file mode 100644 index 7755d9327a8a..000000000000 --- a/databases/clickhouse/files/patch-cmake_freebsd_toolchain-x86__64.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/freebsd/toolchain-x86_64.cmake.orig 2021-12-26 09:29:33 UTC -+++ cmake/freebsd/toolchain-x86_64.cmake -@@ -1,8 +1,8 @@ - set (CMAKE_SYSTEM_NAME "FreeBSD") - set (CMAKE_SYSTEM_PROCESSOR "x86_64") --set (CMAKE_C_COMPILER_TARGET "x86_64-pc-freebsd11") --set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd11") --set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11") -+set (CMAKE_C_COMPILER_TARGET "x86_64-pc-freebsd%%OSREL%%") -+set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd%%OSREL%%") -+set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd%%OSREL%%") - set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_64") - - set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) # disable linkage check - it doesn't work in CMake diff --git a/databases/clickhouse/files/patch-contrib_libbcrypt-cmake_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_libbcrypt-cmake_CMakeLists.txt deleted file mode 100644 index 23e006302d39..000000000000 --- a/databases/clickhouse/files/patch-contrib_libbcrypt-cmake_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- contrib/libbcrypt-cmake/CMakeLists.txt.orig 2025-11-10 18:38:04 UTC -+++ contrib/libbcrypt-cmake/CMakeLists.txt -@@ -7,7 +7,7 @@ set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/lib - - set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libbcrypt") - --set(SRCS -+set(SRCS - "${LIBRARY_DIR}/bcrypt.c" - "${LIBRARY_DIR}/crypt_blowfish/crypt_blowfish.c" - "${LIBRARY_DIR}/crypt_blowfish/crypt_gensalt.c" -@@ -16,4 +16,13 @@ target_include_directories(_bcrypt SYSTEM PUBLIC "${LI - - add_library(_bcrypt ${SRCS}) - target_include_directories(_bcrypt SYSTEM PUBLIC "${LIBRARY_DIR}") -+# Avoid conflicts for crypt_r on FreeBSD [1]: -+# -+# - char *crypt_r(__const char *key, __const char *setting, void *data); -+# - char *crypt_r(const char *, const char *, struct crypt_data *); -+# -+# [1]: https://github.com/freebsd/freebsd-src/commit/5f521d7ba72145092ea23ff6081d8791ad6c1f9d -+# -+# NOTE: ow-crypt.h is unsed only internally, so PRIVATE is enough -+target_compile_definitions(_bcrypt PRIVATE -D__SKIP_GNU) - add_library(ch_contrib::bcrypt ALIAS _bcrypt) diff --git a/databases/clickhouse/files/patch-tests_CMakeLists.txt b/databases/clickhouse/files/patch-tests_CMakeLists.txt deleted file mode 100644 index 2a604f781918..000000000000 --- a/databases/clickhouse/files/patch-tests_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/CMakeLists.txt.orig 2025-11-08 16:37:29 UTC -+++ tests/CMakeLists.txt -@@ -13,7 +13,7 @@ if (ENABLE_CLICKHOUSE_TEST) - install (PROGRAMS clickhouse-test DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse) - install ( - DIRECTORY queries performance config -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/tests/clickhouse - USE_SOURCE_PERMISSIONS - COMPONENT clickhouse - PATTERN "CMakeLists.txt" EXCLUDE |