mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 15:12:02 +00:00
Revert "Build fixes"
This commit is contained in:
alexey-milovidov
GitHub
parent
fc17853c5a
commit
9e0b40bf09
@ -15,8 +15,9 @@ if (USE_INTERNAL_H3_LIBRARY)
|
||||
set (H3_LIBRARY h3)
|
||||
set (H3_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib/include)
|
||||
elseif (NOT MISSING_INTERNAL_H3_LIBRARY)
|
||||
set (H3_INCLUDE_PATHS /usr/local/include/h3)
|
||||
find_library (H3_LIBRARY h3)
|
||||
find_path (H3_INCLUDE_DIR NAMES h3/h3api.h PATHS ${H3_INCLUDE_PATHS})
|
||||
find_path (H3_INCLUDE_DIR NAMES h3api.h PATHS ${H3_INCLUDE_PATHS})
|
||||
endif ()
|
||||
|
||||
if (H3_LIBRARY AND H3_INCLUDE_DIR)
|
||||
|
||||
@ -29,7 +29,7 @@ if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)
|
||||
set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) # for poco
|
||||
set (ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR}) # for protobuf
|
||||
set (ZLIB_FOUND 1) # for poco
|
||||
if (USE_STATIC_LIBRARIES AND DEFINED BUILD_SHARED_LIBS)
|
||||
if (USE_STATIC_LIBRARIES)
|
||||
set (ZLIB_LIBRARIES zlibstatic CACHE INTERNAL "")
|
||||
else ()
|
||||
set (ZLIB_LIBRARIES zlib CACHE INTERNAL "")
|
||||
|
||||
@ -32,9 +32,8 @@ else ()
|
||||
find_program (GOLD_PATH NAMES "ld.gold" "gold")
|
||||
endif ()
|
||||
|
||||
if (NOT OS_FREEBSD)
|
||||
# We prefer LLD linker over Gold or BFD.
|
||||
if (NOT LINKER_NAME)
|
||||
if (NOT LINKER_NAME)
|
||||
if (LLD_PATH)
|
||||
if (COMPILER_GCC)
|
||||
# GCC driver requires one of supported linker names like "lld".
|
||||
@ -44,9 +43,9 @@ if (NOT OS_FREEBSD)
|
||||
set (LINKER_NAME ${LLD_PATH})
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (NOT LINKER_NAME)
|
||||
if (NOT LINKER_NAME)
|
||||
if (GOLD_PATH)
|
||||
if (COMPILER_GCC)
|
||||
set (LINKER_NAME "gold")
|
||||
@ -54,7 +53,6 @@ if (NOT OS_FREEBSD)
|
||||
set (LINKER_NAME ${GOLD_PATH})
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (LINKER_NAME)
|
||||
|
||||
13
contrib/CMakeLists.txt
vendored
13
contrib/CMakeLists.txt
vendored
@ -54,6 +54,7 @@ if (USE_INTERNAL_BTRIE_LIBRARY)
|
||||
endif ()
|
||||
|
||||
if (USE_INTERNAL_ZLIB_LIBRARY)
|
||||
unset (BUILD_SHARED_LIBS CACHE)
|
||||
set (ZLIB_ENABLE_TESTS 0 CACHE INTERNAL "")
|
||||
set (SKIP_INSTALL_ALL 1 CACHE INTERNAL "")
|
||||
set (ZLIB_COMPAT 1 CACHE INTERNAL "") # also enables WITH_GZFILEOP
|
||||
@ -69,14 +70,10 @@ if (USE_INTERNAL_ZLIB_LIBRARY)
|
||||
add_subdirectory (${INTERNAL_ZLIB_NAME})
|
||||
# We should use same defines when including zlib.h as used when zlib compiled
|
||||
target_compile_definitions (zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
|
||||
if (TARGET zlibstatic)
|
||||
target_compile_definitions (zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
|
||||
endif ()
|
||||
target_compile_definitions (zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
|
||||
if (ARCH_AMD64 OR ARCH_AARCH64)
|
||||
target_compile_definitions (zlib PUBLIC X86_64 UNALIGNED_OK)
|
||||
if (TARGET zlibstatic)
|
||||
target_compile_definitions (zlibstatic PUBLIC X86_64 UNALIGNED_OK)
|
||||
endif ()
|
||||
target_compile_definitions (zlib PUBLIC X86_64 UNALIGNED_OK)
|
||||
target_compile_definitions (zlibstatic PUBLIC X86_64 UNALIGNED_OK)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@ -119,7 +116,7 @@ function(mysql_support)
|
||||
endif()
|
||||
if (USE_INTERNAL_ZLIB_LIBRARY)
|
||||
set(ZLIB_FOUND ON)
|
||||
set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
|
||||
set(ZLIB_LIBRARY zlibstatic)
|
||||
set(WITH_EXTERNAL_ZLIB ON)
|
||||
endif()
|
||||
add_subdirectory (mariadb-connector-c)
|
||||
|
||||
@ -45,10 +45,7 @@ if (ENABLE_REPLXX)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (NOT (COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9))
|
||||
target_compile_options(replxx PUBLIC -Wno-documentation)
|
||||
endif ()
|
||||
|
||||
target_compile_options(replxx PUBLIC -Wno-documentation)
|
||||
target_compile_definitions(replxx PUBLIC USE_REPLXX=1)
|
||||
|
||||
message (STATUS "Using replxx")
|
||||
|
||||
@ -176,12 +176,8 @@ elseif (COMPILER_GCC)
|
||||
add_cxx_compile_options(-Wsizeof-array-argument)
|
||||
# Warn for suspicious length parameters to certain string and memory built-in functions if the argument uses sizeof
|
||||
add_cxx_compile_options(-Wsizeof-pointer-memaccess)
|
||||
|
||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9)
|
||||
# Warn about overriding virtual functions that are not marked with the override keyword
|
||||
add_cxx_compile_options(-Wsuggest-override)
|
||||
endif ()
|
||||
|
||||
# Warn about overriding virtual functions that are not marked with the override keyword
|
||||
add_cxx_compile_options(-Wsuggest-override)
|
||||
# Warn whenever a switch statement has an index of boolean type and the case values are outside the range of a boolean type
|
||||
add_cxx_compile_options(-Wswitch-bool)
|
||||
# Warn if a self-comparison always evaluates to true or false
|
||||
|
||||
@ -10,11 +10,7 @@
|
||||
#include <Common/typeid_cast.h>
|
||||
#include <ext/range.h>
|
||||
|
||||
#if __has_include(<h3/h3api.h>)
|
||||
# include <h3/h3api.h>
|
||||
#else
|
||||
# include <h3api.h>
|
||||
#endif
|
||||
#include <h3api.h>
|
||||
|
||||
|
||||
namespace DB
|
||||
|
||||
@ -7,11 +7,7 @@
|
||||
# include <Common/typeid_cast.h>
|
||||
# include <ext/range.h>
|
||||
|
||||
# if __has_include(<h3/h3api.h>)
|
||||
# include <h3/h3api.h>
|
||||
# else
|
||||
# include <h3api.h>
|
||||
# endif
|
||||
# include <h3api.h>
|
||||
|
||||
|
||||
namespace DB
|
||||
|
||||
@ -8,13 +8,8 @@
|
||||
# include <Common/typeid_cast.h>
|
||||
# include <ext/range.h>
|
||||
|
||||
# if __has_include(<h3/h3api.h>)
|
||||
# include <h3/h3api.h>
|
||||
# include <h3/constants.h>
|
||||
# else
|
||||
# include <h3api.h>
|
||||
# include <constants.h>
|
||||
# endif
|
||||
# include <h3api.h>
|
||||
# include <constants.h>
|
||||
|
||||
|
||||
namespace DB
|
||||
|
||||
@ -7,11 +7,7 @@
|
||||
# include <Common/typeid_cast.h>
|
||||
# include <ext/range.h>
|
||||
|
||||
# if __has_include(<h3/h3api.h>)
|
||||
# include <h3/h3api.h>
|
||||
# else
|
||||
# include <h3api.h>
|
||||
# endif
|
||||
# include <h3api.h>
|
||||
|
||||
|
||||
namespace DB
|
||||
|
||||
@ -7,11 +7,7 @@
|
||||
# include <Common/typeid_cast.h>
|
||||
# include <ext/range.h>
|
||||
|
||||
# if __has_include(<h3/h3api.h>)
|
||||
# include <h3/h3api.h>
|
||||
# else
|
||||
# include <h3api.h>
|
||||
# endif
|
||||
# include <h3api.h>
|
||||
|
||||
|
||||
namespace DB
|
||||
|
||||
@ -11,11 +11,7 @@
|
||||
# include <Common/typeid_cast.h>
|
||||
# include <ext/range.h>
|
||||
|
||||
# if __has_include(<h3/h3api.h>)
|
||||
# include <h3/h3api.h>
|
||||
# else
|
||||
# include <h3api.h>
|
||||
# endif
|
||||
# include <h3api.h>
|
||||
|
||||
|
||||
namespace DB
|
||||
|
||||
7
debian/pbuilder-hooks/B90test-server
vendored
7
debian/pbuilder-hooks/B90test-server
vendored
@ -8,6 +8,11 @@ PACKAGE_INSTALL=${PACKAGE_INSTALL=1}
|
||||
TEST_PORT_RANDOM=${TEST_PORT_RANDOM=1}
|
||||
|
||||
if [ "${PACKAGE_INSTALL}" ]; then
|
||||
#for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
|
||||
# apt-get install -y --force-yes "$PKG" ||:
|
||||
# apt-get remove -y "$PKG" ||:
|
||||
#done
|
||||
|
||||
dpkg --auto-deconfigure -i /tmp/buildd/*.deb ||:
|
||||
apt install -y -f --allow-downgrades ||:
|
||||
dpkg -l | grep clickhouse ||:
|
||||
@ -40,6 +45,8 @@ export CLICKHOUSE_PORT_TCP_SECURE=${CLICKHOUSE_PORT_TCP_SECURE:=9440}
|
||||
export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:=8443}
|
||||
|
||||
if [ "${TEST_CONNECT}" ]; then
|
||||
sed -i 's/ssl_conf = ssl_sect/#ssl_conf = ssl_sect/g' /etc/ssl/openssl.cnf ||:
|
||||
|
||||
[ "${TEST_PORT_RANDOM}" ] && echo "<yandex><http_port>${CLICKHOUSE_PORT_HTTP}</http_port><tcp_port>${CLICKHOUSE_PORT_TCP}</tcp_port><interserver_http_port>${CLICKHOUSE_PORT_INTERSERVER}</interserver_http_port></yandex>" > /etc/clickhouse-server/config.d/port.xml
|
||||
|
||||
if [ "${TEST_SSL}" ]; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user