Merge pull request #4210 from proller/fix15

Build fixes (Freebsd, ARM)

CMakeLists.txt

@@ -96,7 +96,7 @@ option (ENABLE_TESTS "Enables tests" ON)
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
     option (USE_INTERNAL_MEMCPY "Use internal implementation of 'memcpy' function instead of provided by libc. Only for x86_64." ON)
 
-    if (OS_LINUX AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES)
+    if (OS_LINUX AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.9.0")
         option (GLIBC_COMPATIBILITY "Set to TRUE to enable compatibility with older glibc libraries. Only for x86_64, Linux. Implies USE_INTERNAL_MEMCPY." ON)
         if (GLIBC_COMPATIBILITY)
             message (STATUS "Some symbols from glibc will be replaced for compatibility")

cmake/find_re2.cmake

@@ -5,13 +5,24 @@ if (NOT USE_INTERNAL_RE2_LIBRARY)
     find_path (RE2_INCLUDE_DIR NAMES re2/re2.h PATHS ${RE2_INCLUDE_PATHS})
 endif ()
 
+string(FIND ${CMAKE_CURRENT_BINARY_DIR} " " _have_space)
+if(_have_space GREATER 0)
+    message(WARNING "Using spaces in build path [${CMAKE_CURRENT_BINARY_DIR}] highly not recommended. Library re2st will be disabled.")
+    set (MISSING_INTERNAL_RE2_ST_LIBRARY 1)
+endif()
+
 if (RE2_LIBRARY AND RE2_INCLUDE_DIR)
     set (RE2_ST_LIBRARY ${RE2_LIBRARY})
-else ()
+elseif (NOT MISSING_INTERNAL_RE2_LIBRARY)
     set (USE_INTERNAL_RE2_LIBRARY 1)
     set (RE2_LIBRARY re2)
-    set (RE2_ST_LIBRARY re2_st)
-    set (USE_RE2_ST 1)
+    set (RE2_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/re2)
+    if (NOT MISSING_INTERNAL_RE2_ST_LIBRARY)
+        set (RE2_ST_LIBRARY re2_st)
+        set (USE_RE2_ST 1)
+    else ()
+        set (RE2_ST_LIBRARY ${RE2_LIBRARY})
+    endif ()
 endif ()
 
 message (STATUS "Using re2: ${RE2_INCLUDE_DIR} : ${RE2_LIBRARY}; ${RE2_ST_INCLUDE_DIR} : ${RE2_ST_LIBRARY}")

dbms/CMakeLists.txt

@@ -206,6 +206,8 @@ target_link_libraries (clickhouse_common_io
     ${CMAKE_DL_LIBS}
 )
 
+target_include_directories(clickhouse_common_io SYSTEM BEFORE PUBLIC ${RE2_INCLUDE_DIR})
+
 if(CPUID_LIBRARY)
     target_link_libraries(clickhouse_common_io PRIVATE ${CPUID_LIBRARY})
 endif()
@@ -235,9 +237,6 @@ target_link_libraries (dbms
     Threads::Threads
 )
 
-if (NOT USE_INTERNAL_RE2_LIBRARY)
-    target_include_directories (dbms SYSTEM BEFORE PRIVATE ${RE2_INCLUDE_DIR})
-endif ()
 
 if (NOT USE_INTERNAL_BOOST_LIBRARY)
     target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
@@ -257,7 +256,6 @@ if (USE_POCO_SQLODBC)
     endif()
 endif()
 
-#if (Poco_Data_FOUND AND NOT USE_INTERNAL_POCO_LIBRARY)
 if (Poco_Data_FOUND)
     target_include_directories (clickhouse_common_io SYSTEM PRIVATE ${Poco_Data_INCLUDE_DIR})
     target_include_directories (dbms SYSTEM PRIVATE ${Poco_Data_INCLUDE_DIR})

dbms/programs/CMakeLists.txt

@@ -139,7 +139,7 @@ else ()
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-format)
     endif ()
-    if (ENABLE_CLICKHOUSE_COPIER)
+    if (ENABLE_CLICKHOUSE_OBFUSCATOR)
         add_custom_target (clickhouse-obfuscator ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-obfuscator DEPENDS clickhouse)
         install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)

dbms/src/Dictionaries/LibraryDictionarySource.cpp

@@ -135,7 +135,11 @@ LibraryDictionarySource::LibraryDictionarySource(
             "LibraryDictionarySource: Can't load lib " + toString() + ": " + Poco::File(path).path() + " - File doesn't exist",
             ErrorCodes::FILE_DOESNT_EXIST);
     description.init(sample_block);
-    library = std::make_shared<SharedLibrary>(path, RTLD_LAZY | RTLD_DEEPBIND);
+    library = std::make_shared<SharedLibrary>(path, RTLD_LAZY
+#if defined(RTLD_DEEPBIND) // Does not exists in freebsd
+        | RTLD_DEEPBIND
+#endif
+    );
     settings = std::make_shared<CStringsHolder>(getLibSettings(config, config_prefix + lib_config_settings));
     if (auto libNew = library->tryGet<decltype(lib_data) (*)(decltype(&settings->strings), decltype(&ClickHouseLibrary::log))>(
             "ClickHouseDictionary_v3_libNew"))

libs/libcommon/include/common/StringRef.h

@@ -10,11 +10,11 @@
 
 #include <city.h>
 
-#if __SSE2__
+#if defined(__SSE2__)
     #include <emmintrin.h>
 #endif
 
-#if __SSE4_2__
+#if defined(__SSE4_2__)
     #include <smmintrin.h>
     #include <nmmintrin.h>
 #endif
@@ -39,7 +39,7 @@ struct StringRef
 using StringRefs = std::vector<StringRef>;
 
 
-#if __SSE2__
+#if defined(__SSE2__)
 
 /** Compare strings for equality.
   * The approach is controversial and does not win in all cases.
@@ -133,7 +133,7 @@ inline bool operator== (StringRef lhs, StringRef rhs)
     if (lhs.size == 0)
         return true;
 
-#if __SSE2__
+#if defined(__SSE2__)
     return memequalSSE2Wide(lhs.data, rhs.data, lhs.size);
 #else
     return 0 == memcmp(lhs.data, rhs.data, lhs.size);
@@ -174,7 +174,7 @@ struct StringRefHash64
     }
 };
 
-#if __SSE4_2__
+#if defined(__SSE4_2__)
 
 /// Parts are taken from CityHash.
 

libs/libcommon/include/common/find_symbols.h

@@ -2,10 +2,10 @@
 
 #include <cstdint>
 
-#if __SSE2__
+#if defined(__SSE2__)
     #include <emmintrin.h>
 #endif
-#if __SSE4_2__
+#if defined(__SSE4_2__)
     #include <nmmintrin.h>
 #endif
 
@@ -48,7 +48,7 @@ inline bool is_in(char x)
     return x == s0 || is_in<s1, tail...>(x);
 }
 
-#if __SSE2__
+#if defined(__SSE2__)
 template <char s0>
 inline __m128i mm_is_in(__m128i bytes)
 {
@@ -69,7 +69,7 @@ inline __m128i mm_is_in(__m128i bytes)
 template <char... symbols>
 inline const char * find_first_symbols_sse2(const char * begin, const char * end)
 {
-#if __SSE2__
+#if defined(__SSE2__)
     for (; begin + 15 < end; begin += 16)
     {
         __m128i bytes = _mm_loadu_si128(reinterpret_cast<const __m128i *>(begin));
@@ -92,7 +92,7 @@ inline const char * find_first_symbols_sse2(const char * begin, const char * end
 template <char... symbols>
 inline const char * find_last_symbols_or_null_sse2(const char * begin, const char * end)
 {
-#if __SSE2__
+#if defined(__SSE2__)
     for (; end - 16 >= begin; end -= 16)     /// Assuming the pointer cannot overflow. Assuming we can compare these pointers.
     {
         __m128i bytes = _mm_loadu_si128(reinterpret_cast<const __m128i *>(end - 16));
@@ -121,7 +121,7 @@ template <size_t num_chars,
     char c13 = 0, char c14 = 0, char c15 = 0, char c16 = 0>
 inline const char * find_first_symbols_sse42_impl(const char * begin, const char * end)
 {
-#if __SSE4_2__
+#if defined(__SSE4_2__)
 #define MODE (_SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT)
     __m128i set = _mm_setr_epi8(c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16);
 
@@ -168,7 +168,7 @@ inline const char * find_first_symbols_sse42(const char * begin, const char * en
 template <char... symbols>
 inline const char * find_first_symbols_dispatch(const char * begin, const char * end)
 {
-#if __SSE4_2__
+#if defined(__SSE4_2__)
     if (sizeof...(symbols) >= 5)
         return find_first_symbols_sse42<symbols...>(begin, end);
     else