Merge pull request #57180 from ClickHouse/musl-7

Check what will happen if we build ClickHouse with Musl

.github/workflows/master.yml

@@ -205,6 +205,12 @@ jobs:
     with:
       build_name: binary_amd64_compat
       checkout_depth: 0
+  BuilderBinAmd64Musl:
+    needs: [DockerHubPush]
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_amd64_musl
+      checkout_depth: 0
   BuilderBinAarch64V80Compat:
     needs: [DockerHubPush]
     uses: ./.github/workflows/reusable_build.yml

.github/workflows/pull_request.yml

@@ -242,6 +242,11 @@ jobs:
     uses: ./.github/workflows/reusable_build.yml
     with:
       build_name: binary_amd64_compat
+  BuilderBinAmd64Musl:
+    needs: [FastTest, StyleCheck]
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: binary_amd64_musl
   BuilderBinAarch64V80Compat:
     needs: [FastTest, StyleCheck]
     uses: ./.github/workflows/reusable_build.yml

cmake/target.cmake

@@ -42,10 +42,8 @@ if (CMAKE_CROSSCOMPILING)
         if (ARCH_AARCH64)
             # FIXME: broken dependencies
             set (ENABLE_GRPC OFF CACHE INTERNAL "")
-            set (ENABLE_SENTRY OFF CACHE INTERNAL "")
         elseif (ARCH_PPC64LE)
             set (ENABLE_GRPC OFF CACHE INTERNAL "")
-            set (ENABLE_SENTRY OFF CACHE INTERNAL "")
         elseif (ARCH_RISCV64)
             # RISC-V support is preliminary
             set (GLIBC_COMPATIBILITY OFF CACHE INTERNAL "")
@@ -73,19 +71,10 @@ if (CMAKE_CROSSCOMPILING)
         message (FATAL_ERROR "Trying to cross-compile to unsupported system: ${CMAKE_SYSTEM_NAME}!")
     endif ()
 
-    if (USE_MUSL)
-        # use of undeclared identifier 'PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP'
-        set (ENABLE_SENTRY OFF CACHE INTERNAL "")
-        set (ENABLE_ODBC OFF CACHE INTERNAL "")
-        set (ENABLE_GRPC OFF CACHE INTERNAL "")
-        set (ENABLE_HDFS OFF CACHE INTERNAL "")
-        set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
-        # use of drand48_data
-        set (ENABLE_AZURE_BLOB_STORAGE OFF CACHE INTERNAL "")
-    endif ()
-
-    # Don't know why but CXX_STANDARD doesn't work for cross-compilation
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
-
     message (STATUS "Cross-compiling for target: ${CMAKE_CXX_COMPILE_TARGET}")
 endif ()
+
+if (USE_MUSL)
+    # Does not work for unknown reason
+    set (ENABLE_RUST OFF CACHE INTERNAL "")
+endif ()

contrib/azure

@@ -1 +1 @@
-Subproject commit 096049bf24fffafcaccc132b9367694532716731
+Subproject commit 352ff0a61cb319ac1cc38c4058443ddf70147530

contrib/libhdfs3

@@ -1 +1 @@
-Subproject commit bdcb91354b1c05b21e73043a112a6f1e3b013497
+Subproject commit b9598e6016720a7c088bfe85ce1fa0410f9d2103

contrib/libhdfs3-cmake/CMakeLists.txt

@@ -26,6 +26,11 @@ ADD_DEFINITIONS(-D__STDC_FORMAT_MACROS)
 ADD_DEFINITIONS(-D_GNU_SOURCE)
 ADD_DEFINITIONS(-D_GLIBCXX_USE_NANOSLEEP)
 ADD_DEFINITIONS(-DHAVE_NANOSLEEP)
+
+if (USE_MUSL)
+    ADD_DEFINITIONS(-DSTRERROR_R_RETURN_INT)
+endif ()
+
 set(HAVE_STEADY_CLOCK 1)
 set(HAVE_NESTED_EXCEPTION 1)
 SET(HAVE_BOOST_CHRONO 0)

contrib/llvm-project

@@ -1 +1 @@
-Subproject commit e7b8befca85c8b847614432dba250c22d35fbae0
+Subproject commit 1834e42289c58402c804a87be4d489892b88f3ec

contrib/rocksdb-cmake/CMakeLists.txt

@@ -117,7 +117,7 @@ endif()
 
 add_definitions(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX)
 
-if (OS_LINUX OR OS_FREEBSD)
+if ((OS_LINUX OR OS_FREEBSD) AND NOT USE_MUSL)
   add_definitions(-DROCKSDB_PTHREAD_ADAPTIVE_MUTEX)
 endif()
 

contrib/unixodbc-cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 option (ENABLE_ODBC "Enable ODBC library" ${ENABLE_LIBRARIES})
-if (NOT OS_LINUX)
+if (NOT OS_LINUX OR USE_MUSL)
     if (ENABLE_ODBC)
-        message(STATUS "ODBC is only supported on Linux")
+        message(STATUS "ODBC is only supported on Linux with dynamic linking")
     endif()
     set (ENABLE_ODBC OFF CACHE INTERNAL "")
 endif ()

docker/packager/packager

@@ -145,6 +145,7 @@ def parse_env_variables(
     RISCV_SUFFIX = "-riscv64"
     S390X_SUFFIX = "-s390x"
     AMD64_COMPAT_SUFFIX = "-amd64-compat"
+    AMD64_MUSL_SUFFIX = "-amd64-musl"
 
     result = []
     result.append("OUTPUT_DIR=/output")
@@ -163,6 +164,7 @@ def parse_env_variables(
     is_cross_s390x = compiler.endswith(S390X_SUFFIX)
     is_cross_freebsd = compiler.endswith(FREEBSD_SUFFIX)
     is_amd64_compat = compiler.endswith(AMD64_COMPAT_SUFFIX)
+    is_amd64_musl = compiler.endswith(AMD64_MUSL_SUFFIX)
 
     if is_cross_darwin:
         cc = compiler[: -len(DARWIN_SUFFIX)]
@@ -232,6 +234,12 @@ def parse_env_variables(
         cc = compiler[: -len(AMD64_COMPAT_SUFFIX)]
         result.append("DEB_ARCH=amd64")
         cmake_flags.append("-DNO_SSE3_OR_HIGHER=1")
+    elif is_amd64_musl:
+        cc = compiler[: -len(AMD64_MUSL_SUFFIX)]
+        result.append("DEB_ARCH=amd64")
+        cmake_flags.append(
+            "-DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-x86_64-musl.cmake"
+        )
     else:
         cc = compiler
         result.append("DEB_ARCH=amd64")
@@ -396,6 +404,7 @@ def parse_args() -> argparse.Namespace:
             "clang-17-riscv64",
             "clang-17-s390x",
             "clang-17-amd64-compat",
+            "clang-17-amd64-musl",
             "clang-17-freebsd",
         ),
         default="clang-17",

tests/ci/ci_config.py

@@ -208,6 +208,13 @@ CI_CONFIG = CiConfig(
             static_binary_name="amd64compat",
             comment="SSE2-only build",
         ),
+        "binary_amd64_musl": BuildConfig(
+            name="binary_amd64_musl",
+            compiler="clang-17-amd64-musl",
+            package_type="binary",
+            static_binary_name="amd64musl",
+            comment="Build with Musl",
+        ),
         "binary_riscv64": BuildConfig(
             name="binary_riscv64",
             compiler="clang-17-riscv64",
@@ -249,6 +256,7 @@ CI_CONFIG = CiConfig(
             "binary_riscv64",
             "binary_s390x",
             "binary_amd64_compat",
+            "binary_amd64_musl",
         ],
     },
     test_configs={