mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 15:12:02 +00:00
Using libressl #1983
This commit is contained in:
Alexey Milovidov
alexey-milovidov
parent
dbd2f00cb5
commit
a2fca20a4b
105
.travis.yml
105
.travis.yml
@ -3,26 +3,6 @@ language: generic
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
# - os: linux
|
||||
#
|
||||
# cache:
|
||||
# ccache: true
|
||||
# timeout: 1000
|
||||
#
|
||||
# addons:
|
||||
# apt:
|
||||
# update: true
|
||||
# sources:
|
||||
# - ubuntu-toolchain-r-test
|
||||
# packages: [ g++-7, libicu-dev, libreadline-dev, libmysqlclient-dev, unixodbc-dev, libltdl-dev, libssl-dev, libboost-dev, zlib1g-dev, libdouble-conversion-dev, libsparsehash-dev, librdkafka-dev, libcapnp-dev, libsparsehash-dev, libgoogle-perftools-dev, bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo, openssl ]
|
||||
#
|
||||
# env:
|
||||
# - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7"
|
||||
#
|
||||
# script:
|
||||
# - env TEST_RUN= utils/travis/normal.sh
|
||||
|
||||
|
||||
# We need to have gcc7 headers to compile c++17 code on clang
|
||||
- os: linux
|
||||
|
||||
@ -46,28 +26,6 @@ matrix:
|
||||
script:
|
||||
- utils/travis/normal.sh
|
||||
|
||||
|
||||
# TODO: fix internal compiler
|
||||
# - os: linux
|
||||
#
|
||||
# sudo: required
|
||||
#
|
||||
# cache:
|
||||
# timeout: 1000
|
||||
# directories:
|
||||
# - /var/cache/pbuilder/ccache
|
||||
#
|
||||
# addons:
|
||||
# apt:
|
||||
# packages: [ pbuilder, fakeroot, debhelper ]
|
||||
#
|
||||
# env:
|
||||
# - MATRIX_EVAL="export DEB_CC=clang-5.0 DEB_CXX=clang++-5.0"
|
||||
#
|
||||
# script:
|
||||
# - utils/travis/pbuilder.sh
|
||||
|
||||
|
||||
- os: linux
|
||||
|
||||
sudo: required
|
||||
@ -85,69 +43,6 @@ matrix:
|
||||
script:
|
||||
- utils/travis/pbuilder.sh
|
||||
|
||||
|
||||
# - os: linux
|
||||
#
|
||||
# sudo: required
|
||||
#
|
||||
# cache:
|
||||
# timeout: 1000
|
||||
# directories:
|
||||
# - /var/cache/pbuilder/ccache
|
||||
#
|
||||
# addons:
|
||||
# apt:
|
||||
# update: true
|
||||
# packages: [ pbuilder, fakeroot, debhelper ]
|
||||
#
|
||||
# env:
|
||||
# - MATRIX_EVAL="export ARCH=i386"
|
||||
#
|
||||
# script:
|
||||
# - env PBUILDER_TIMEOUT=40m TEST_TRUE=true TEST_RUN= utils/travis/pbuilder.sh
|
||||
|
||||
|
||||
# TODO: Can't bootstrap bionic on trusty host
|
||||
# - os: linux
|
||||
#
|
||||
# sudo: required
|
||||
#
|
||||
# cache:
|
||||
# timeout: 1000
|
||||
# directories:
|
||||
# - /var/cache/pbuilder/ccache
|
||||
#
|
||||
# addons:
|
||||
# apt:
|
||||
# update: true
|
||||
# packages: [ pbuilder, fakeroot, debhelper ]
|
||||
#
|
||||
# env:
|
||||
# - MATRIX_EVAL="export DEB_CC=clang-6.0 DEB_CXX=clang++-6.0 DIST=bionic EXTRAPACKAGES='clang-6.0 lld-6.0'"
|
||||
#
|
||||
# script:
|
||||
# - utils/travis/pbuilder.sh
|
||||
|
||||
|
||||
# Cant fit to time limit (48min)
|
||||
# - os: osx
|
||||
# osx_image: xcode9.2
|
||||
#
|
||||
# cache:
|
||||
# ccache: true
|
||||
# timeout: 1000
|
||||
#
|
||||
# before_install:
|
||||
# - brew install unixodbc gcc ccache libtool gettext zlib readline double-conversion gperftools google-sparsehash lz4 zstd || true
|
||||
# - brew link --overwrite gcc || true
|
||||
#
|
||||
# env:
|
||||
# - MATRIX_EVAL="export CC=gcc-8 CXX=g++-8"
|
||||
#
|
||||
# script:
|
||||
# - env CMAKE_FLAGS="-DUSE_INTERNAL_BOOST_LIBRARY=1" utils/travis/normal.sh
|
||||
|
||||
|
||||
allow_failures:
|
||||
- os: osx
|
||||
|
||||
|
||||
@ -249,19 +249,15 @@ message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE
|
||||
include(GNUInstallDirs)
|
||||
|
||||
include (cmake/find_ssl.cmake)
|
||||
if (NOT OPENSSL_FOUND)
|
||||
message (FATAL_ERROR "Need openssl for build. debian tip: sudo apt install libssl-dev")
|
||||
endif ()
|
||||
|
||||
include (cmake/lib_name.cmake)
|
||||
include (cmake/find_icu4c.cmake)
|
||||
include (cmake/find_boost.cmake)
|
||||
# openssl, zlib before poco
|
||||
include (cmake/find_zlib.cmake)
|
||||
include (cmake/find_zstd.cmake)
|
||||
include (cmake/find_ltdl.cmake) # for odbc
|
||||
include (cmake/find_termcap.cmake)
|
||||
include (cmake/find_odbc.cmake)
|
||||
# openssl, zlib, odbc before poco
|
||||
include (cmake/find_poco.cmake)
|
||||
include (cmake/find_lz4.cmake)
|
||||
include (cmake/find_sparsehash.cmake)
|
||||
|
||||
@ -3,7 +3,6 @@ set -e -x
|
||||
|
||||
source default-config
|
||||
|
||||
./install-os-packages.sh libssl-dev
|
||||
./install-os-packages.sh libicu-dev
|
||||
./install-os-packages.sh libreadline-dev
|
||||
|
||||
|
||||
@ -43,9 +43,6 @@ case $PACKAGE_MANAGER in
|
||||
jq)
|
||||
$SUDO apt-get install -y jq
|
||||
;;
|
||||
libssl-dev)
|
||||
$SUDO apt-get install -y libssl-dev
|
||||
;;
|
||||
libicu-dev)
|
||||
$SUDO apt-get install -y libicu-dev
|
||||
;;
|
||||
@ -91,9 +88,6 @@ case $PACKAGE_MANAGER in
|
||||
jq)
|
||||
$SUDO yum install -y jq
|
||||
;;
|
||||
libssl-dev)
|
||||
$SUDO yum install -y openssl-devel
|
||||
;;
|
||||
libicu-dev)
|
||||
$SUDO yum install -y libicu-devel
|
||||
;;
|
||||
@ -133,9 +127,6 @@ case $PACKAGE_MANAGER in
|
||||
jq)
|
||||
$SUDO pkg install -y jq
|
||||
;;
|
||||
libssl-dev)
|
||||
$SUDO pkg install -y openssl
|
||||
;;
|
||||
libicu-dev)
|
||||
$SUDO pkg install -y icu
|
||||
;;
|
||||
|
||||
@ -92,8 +92,7 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
# TODO! fix internal ssl
|
||||
if (OPENSSL_FOUND AND NOT USE_INTERNAL_SSL_LIBRARY AND (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL))
|
||||
if (OPENSSL_FOUND AND (NOT DEFINED ENABLE_POCO_NETSSL OR ENABLE_POCO_NETSSL))
|
||||
set (Poco_NetSSL_LIBRARY PocoNetSSL)
|
||||
set (Poco_Crypto_LIBRARY PocoCrypto)
|
||||
endif ()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
option (USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${MSVC})
|
||||
option (USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${ARCH_LINUX})
|
||||
|
||||
set (OPENSSL_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
|
||||
|
||||
|
||||
5
contrib/CMakeLists.txt
vendored
5
contrib/CMakeLists.txt
vendored
@ -150,11 +150,6 @@ if (USE_INTERNAL_POCO_LIBRARY)
|
||||
set (_save ${ENABLE_TESTS})
|
||||
set (ENABLE_TESTS 0)
|
||||
set (CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
|
||||
if (USE_INTERNAL_SSL_LIBRARY OR (DEFINED ENABLE_POCO_NETSSL AND NOT ENABLE_POCO_NETSSL))
|
||||
set (DISABLE_INTERNAL_OPENSSL 1 CACHE INTERNAL "")
|
||||
set (ENABLE_NETSSL 0 CACHE INTERNAL "") # TODO!
|
||||
set (ENABLE_CRYPTO 0 CACHE INTERNAL "") # TODO!
|
||||
endif ()
|
||||
if (MSVC)
|
||||
set (ENABLE_DATA_ODBC 0 CACHE INTERNAL "") # TODO (build fail)
|
||||
endif ()
|
||||
|
||||
@ -46,7 +46,7 @@ export CXX=g++-7
|
||||
## Install required libraries from packages
|
||||
|
||||
```bash
|
||||
sudo apt-get install libicu-dev libreadline-dev libssl-dev
|
||||
sudo apt-get install libicu-dev libreadline-dev
|
||||
```
|
||||
|
||||
## Checkout ClickHouse sources
|
||||
|
||||
2
release
2
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 libmariadbclient-dev libicu-dev libltdl-dev libreadline-dev libssl-dev unixodbc-dev psmisc bash expect python python-lxml python-termcolor python-requests curl perl sudo openssl netcat-openbsd"
|
||||
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"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# curl https://raw.githubusercontent.com/yandex/ClickHouse/master/utils/build/build_debian.sh | sh
|
||||
|
||||
# install compiler and libs
|
||||
sudo apt install -y git bash cmake gcc-7 g++-7 libicu-dev libreadline-dev libmysqlclient-dev unixodbc-dev libltdl-dev libssl-dev
|
||||
sudo apt install -y git bash cmake gcc-7 g++-7 libicu-dev libreadline-dev
|
||||
# for -DUNBUNDLED=1 mode:
|
||||
#sudo apt install -y libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev zlib1g-dev liblz4-dev libdouble-conversion-dev libzstd-dev libre2-dev libsparsehash-dev librdkafka-dev libcapnp-dev libpoco-dev libsparsehash-dev libgoogle-perftools-dev libunwind-dev googletest libcctz-dev
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user