thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix macos build (#3861)

Browse Source
This commit is contained in:
proller 2018-12-18 16:37:00 +03:00 committed by GitHub
parent 8720d3b937
commit c63ca042ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/find_hdfs3.cmake
View File

@ -15,12 +15,15 @@ if (NOT USE_INTERNAL_HDFS3_LIBRARY)
endif ()
if (HDFS3_LIBRARY AND HDFS3_INCLUDE_DIR)
else ()
set(USE_HDFS 1)
elseif (LIBGSASL_LIBRARY)
set(HDFS3_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include")
set(HDFS3_LIBRARY hdfs3)
set(USE_HDFS 1)
else()
set(USE_INTERNAL_HDFS3_LIBRARY 0)
endif()
set (USE_HDFS 1)
endif()
message (STATUS "Using hdfs3: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")
message (STATUS "Using hdfs3=${USE_HDFS}: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")

4
cmake/find_libgsasl.cmake
View File

@ -1,4 +1,4 @@
if (NOT APPLE)
if (NOT APPLE AND NOT ARCH_32)
option (USE_INTERNAL_LIBGSASL_LIBRARY "Set to FALSE to use system libgsasl library instead of bundled" ${NOT_UNBUNDLED})
endif ()
@ -13,7 +13,7 @@ if (NOT USE_INTERNAL_LIBGSASL_LIBRARY)
endif ()
if (LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR)
else ()
elseif (NOT APPLE AND NOT ARCH_32)
set (LIBGSASL_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src ${ClickHouse_SOURCE_DIR}/contrib/libgsasl/linux_x86_64/include)
set (USE_INTERNAL_LIBGSASL_LIBRARY 1)
set (LIBGSASL_LIBRARY libgsasl)

2
cmake/find_rdkafka.cmake
View File

@ -1,4 +1,4 @@
if (NOT ARCH_ARM)
if (NOT ARCH_ARM AND NOT ARCH_32)
option (ENABLE_RDKAFKA "Enable kafka" ON)
endif ()

6
cmake/find_ssl.cmake
View File

@ -1,6 +1,6 @@
#if (OS_LINUX)
option (USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${NOT_UNBUNDLED})
#endif ()
if(NOT ARCH_32)
option(USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${NOT_UNBUNDLED})
endif()
set (OPENSSL_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})

2
cmake/find_zlib.cmake
View File

@ -1,4 +1,4 @@
if (NOT OS_FREEBSD)
if (NOT OS_FREEBSD AND NOT ARCH_32)
option (USE_INTERNAL_ZLIB_LIBRARY "Set to FALSE to use system zlib library instead of bundled" ${NOT_UNBUNDLED})
endif ()

2
dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
View File

@ -4,7 +4,7 @@ namespace DB
{
UInt64 DiskSpaceMonitor::reserved_bytes;
size_t DiskSpaceMonitor::reservation_count;
UInt64 DiskSpaceMonitor::reservation_count;
std::mutex DiskSpaceMonitor::mutex;
}

2
debian/.pbuilderrc vendored
View File

@ -192,6 +192,8 @@ EXTRAPACKAGES+=" psmisc "
[[ $CCACHE_PREFIX == 'distcc' ]] && EXTRAPACKAGES+=" $CCACHE_PREFIX " && USENETWORK=yes && export DISTCC_DIR=/var/cache/pbuilder/distcc
[[ $ARCH == 'i386' ]] && EXTRAPACKAGES+=" libssl-dev "
export DEB_BUILD_OPTIONS=parallel=`nproc`
# Floating bug with permissions:

2
libs/libcommon/cmake/find_jemalloc.cmake
View File

@ -1,4 +1,4 @@
if (OS_LINUX AND NOT SANITIZE AND NOT ARCH_ARM)
if (OS_LINUX AND NOT SANITIZE AND NOT ARCH_ARM AND NOT ARCH_32)
set(ENABLE_JEMALLOC_DEFAULT 1)
else ()
set(ENABLE_JEMALLOC_DEFAULT 0)