From 7ce0d5964869cf83f76822e713a805866cc13382 Mon Sep 17 00:00:00 2001 From: proller Date: Fri, 7 Dec 2018 23:12:06 +0300 Subject: [PATCH] Build fixes --- cmake/find_hdfs3.cmake | 2 +- cmake/find_libgsasl.cmake | 4 +++- contrib/CMakeLists.txt | 2 +- release | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/find_hdfs3.cmake b/cmake/find_hdfs3.cmake index 757c604b784..a6fdec20291 100644 --- a/cmake/find_hdfs3.cmake +++ b/cmake/find_hdfs3.cmake @@ -1,4 +1,4 @@ -if (NOT ARCH_ARM) +if (NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT APPLE) option (ENABLE_HDFS "Enable HDFS" ${NOT_UNBUNDLED}) endif () diff --git a/cmake/find_libgsasl.cmake b/cmake/find_libgsasl.cmake index b352b14c046..b686bb1df7f 100644 --- a/cmake/find_libgsasl.cmake +++ b/cmake/find_libgsasl.cmake @@ -1,4 +1,6 @@ -option (USE_INTERNAL_LIBGSASL_LIBRARY "Set to FALSE to use system libgsasl library instead of bundled" ${NOT_UNBUNDLED}) +if (NOT APPLE) + option (USE_INTERNAL_LIBGSASL_LIBRARY "Set to FALSE to use system libgsasl library instead of bundled" ${NOT_UNBUNDLED}) +endif () if (USE_INTERNAL_LIBGSASL_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src/gsasl.h") message (WARNING "submodule contrib/libgsasl is missing. to fix try run: \n git submodule update --init --recursive") diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 3eb7970d3d1..66173322659 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -202,7 +202,7 @@ if (USE_INTERNAL_LIBXML2_LIBRARY) endif () if (USE_INTERNAL_HDFS3_LIBRARY) - include(${CMAKE_SOURCE_DIR}/cmake/find_protobuf.cmake) + include(${ClickHouse_SOURCE_DIR}/cmake/find_protobuf.cmake) if (USE_INTERNAL_PROTOBUF_LIBRARY) set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "" FORCE) set(protobuf_BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE) diff --git a/release b/release index 4c536609571..23bfd6f2dd6 100755 --- a/release +++ b/release @@ -64,7 +64,7 @@ do shift elif [[ $1 == '--fast' ]]; then # Wrong but fast pbuilder mode: create base package with all depends - EXTRAPACKAGES="$EXTRAPACKAGES debhelper cmake ninja-build gcc-7 g++-7 libc6-dev libicu-dev libreadline-dev psmisc bash expect python python-lxml python-termcolor python-requests curl perl sudo openssl netcat-openbsd uuid xml2 krb5 gsasl" + EXTRAPACKAGES="$EXTRAPACKAGES debhelper cmake ninja-build gcc-7 g++-7 libc6-dev libicu-dev libreadline-dev psmisc bash expect python python-lxml python-termcolor python-requests curl perl sudo openssl netcat-openbsd" shift else echo "Unknown option $1"