From cc3de4115fb52ba181f19a262d750a7e8888f48b Mon Sep 17 00:00:00 2001
From: proller <proller@users.noreply.github.com>
Date: Tue, 14 May 2019 12:58:33 +0300
Subject: [PATCH] Build fixes (#5261)

---
 dbms/programs/CMakeLists.txt                       | 3 +++
 dbms/src/Common/StringSearcher.h                   | 1 +
 dbms/src/Functions/Regexps.h                       | 1 +
 dbms/src/Storages/MergeTree/MergeTreeRangeReader.h | 1 +
 release                                            | 2 +-
 utils/check-style/check-include                    | 2 ++
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dbms/programs/CMakeLists.txt b/dbms/programs/CMakeLists.txt
index af65df6e8fe..6626d90e5f5 100644
--- a/dbms/programs/CMakeLists.txt
+++ b/dbms/programs/CMakeLists.txt
@@ -209,6 +209,9 @@ else ()
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)
     endif ()
+    if(ENABLE_CLICKHOUSE_ODBC_BRIDGE)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-odbc-bridge)
+    endif()
 
     # install always because depian package want this files:
     add_custom_target (clickhouse-clang ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-clang DEPENDS clickhouse)
diff --git a/dbms/src/Common/StringSearcher.h b/dbms/src/Common/StringSearcher.h
index 6d897e4326d..9e1f2413439 100644
--- a/dbms/src/Common/StringSearcher.h
+++ b/dbms/src/Common/StringSearcher.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Common/UTF8Helpers.h>
+#include <Core/Defines.h>
 #include <ext/range.h>
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>
diff --git a/dbms/src/Functions/Regexps.h b/dbms/src/Functions/Regexps.h
index 48d285e394a..164f8718cf0 100644
--- a/dbms/src/Functions/Regexps.h
+++ b/dbms/src/Functions/Regexps.h
@@ -11,6 +11,7 @@
 #include <Common/ObjectPool.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/ProfileEvents.h>
+#include <Common/Exception.h>
 #include <common/StringRef.h>
 
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeRangeReader.h b/dbms/src/Storages/MergeTree/MergeTreeRangeReader.h
index bd3ae49f529..c80fff31419 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeRangeReader.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeRangeReader.h
@@ -12,6 +12,7 @@ class ColumnVector;
 using ColumnUInt8 = ColumnVector<UInt8>;
 
 class MergeTreeReader;
+class MergeTreeIndexGranularity;
 
 /// MergeTreeReader iterator which allows sequential reading for arbitrary number of rows between pairs of marks in the same part.
 /// Stores reading state, which can be inside granule. Can skip rows in current granule and start reading from next mark.
diff --git a/release b/release
index 509e28d9323..8be67e99640 100755
--- a/release
+++ b/release
@@ -111,7 +111,7 @@ if [ -z "$USE_PBUILDER" ] ; then
     DEB_CC=${DEB_CC:=`which gcc-7 gcc-8 gcc | head -n1`}
     DEB_CXX=${DEB_CXX:=`which g++-7 g++-8 g++ | head -n1`}
     # Build (only binary packages).
-    debuild -e PATH -e SSH_AUTH_SOCK \
+    debuild --preserve-env -e PATH \
     -e DEB_CC=$DEB_CC -e DEB_CXX=$DEB_CXX -e CMAKE_FLAGS="$CMAKE_FLAGS" \
     -b ${DEBUILD_NOSIGN_OPTIONS} ${DEBUILD_NODEPS_OPTIONS}
 else
diff --git a/utils/check-style/check-include b/utils/check-style/check-include
index 28aacf95670..1b1bf3d56e0 100755
--- a/utils/check-style/check-include
+++ b/utils/check-style/check-include
@@ -58,6 +58,8 @@ inc="-I. \
 -I./contrib/cppkafka/include \
 -I./contrib/librdkafka-cmake/include \
 -I./contrib/lz4/lib \
+-I./contrib/hyperscan/src \
+-I./contrib/simdjson/include \
 -I./dbms/src \
 -I${BUILD_DIR}/dbms/src"