File 0001-When-GLIBC_COMPATIBILITY-is-disabled-bundl... of Package clickhouse

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-When-GLIBC_COMPATIBILITY-is-disabled-bundled-libc-he.patch of Package clickhouse (Revision 5b8061e3c2c39497a8be106bc29df6eb)

Currently displaying revision 5b8061e3c2c39497a8be106bc29df6eb , Show latest

From dfff70844973d11bff5a0eeec1bef22f8c129a57 Mon Sep 17 00:00:00 2001
From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
Date: Mon, 8 Jun 2020 12:53:41 +0300
Subject: [PATCH] When GLIBC_COMPATIBILITY is disabled, bundled libc-headers
 are not required

---
 cmake/linux/default_libs.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/linux/default_libs.cmake b/cmake/linux/default_libs.cmake
index d18a996e2c..740a070716 100644
--- a/cmake/linux/default_libs.cmake
+++ b/cmake/linux/default_libs.cmake
@@ -21,7 +21,7 @@ set(CMAKE_C_STANDARD_LIBRARIES ${DEFAULT_LIBS})
 # glibc-compatibility library relies to fixed version of libc headers
 # (because minor changes in function attributes between different glibc versions will introduce incompatibilities)
 # This is for x86_64. For other architectures we have separate toolchains.
-if (ARCH_AMD64)
+if (ARCH_AMD64 AND GLIBC_COMPATIBILITY)
     set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
     set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
 endif ()
-- 
2.25.0

Places

File 0001-When-GLIBC_COMPATIBILITY-is-disabled-bundled-libc-he.patch of Package clickhouse (Revision 5b8061e3c2c39497a8be106bc29df6eb)

Places