Bump to 19.5.3.8, use bundled arrow and zlib, disable internal compiler on CLang 8+ systems
This commit is contained in:
kmeaw
33
.SRCINFO
33
.SRCINFO
@ -1,6 +1,6 @@
|
||||
pkgbase = clickhouse
|
||||
pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time
|
||||
pkgver = 19.4.0.49
|
||||
pkgver = 19.5.3.8
|
||||
pkgrel = 1
|
||||
url = https://clickhouse.yandex/
|
||||
install = clickhouse.install
|
||||
@ -9,9 +9,7 @@ pkgbase = clickhouse
|
||||
license = Apache
|
||||
makedepends = cmake
|
||||
makedepends = patchelf
|
||||
depends = arrow
|
||||
depends = cppkafka-git
|
||||
depends = zstd-static
|
||||
depends = jemalloc-git
|
||||
depends = ncurses
|
||||
depends = readline
|
||||
@ -23,40 +21,47 @@ pkgbase = clickhouse
|
||||
depends = gtest
|
||||
depends = gsasl
|
||||
depends = libxml2
|
||||
depends = llvm
|
||||
depends = llvm>=8
|
||||
depends = brotli
|
||||
depends = lld
|
||||
depends = clang
|
||||
depends = libdaemon
|
||||
depends = poco
|
||||
depends = snappy
|
||||
backup = etc/clickhouse-client/config.xml
|
||||
backup = etc/clickhouse-server/config.xml
|
||||
backup = etc/clickhouse-server/users.xml
|
||||
source = https://github.com/yandex/ClickHouse/archive/v19.4.0.49-stable.tar.gz
|
||||
source = https://github.com/yandex/ClickHouse/archive/v19.5.3.8-stable.tar.gz
|
||||
source = https://github.com/apache/arrow/archive/87ac6fd.tar.gz
|
||||
source = https://github.com/google/cctz/archive/4f9776a.tar.gz
|
||||
source = https://github.com/edenhill/librdkafka/archive/363dcad.tar.gz
|
||||
source = https://github.com/mfontanini/cppkafka/archive/860c90e.tar.gz
|
||||
source = https://github.com/edenhill/librdkafka/archive/8695b9d.tar.gz
|
||||
source = https://github.com/mfontanini/cppkafka/archive/9b184d8.tar.gz
|
||||
source = https://github.com/lz4/lz4/archive/c10863b.tar.gz
|
||||
source = https://github.com/Dead2/zlib-ng/archive/9173b89.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/boost/archive/6a96e8b.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/boost/archive/471ea20.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/ssl/archive/ba8de79.tar.gz
|
||||
source = https://github.com/aklomp/base64/archive/a27c565.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/libhdfs3/archive/bd6505c.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/libhdfs3/archive/e2131aa.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/protobuf/archive/1273537.tar.gz
|
||||
source = https://github.com/apache/thrift/archive/010ccf0.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/hyperscan/archive/05dab0e.tar.gz
|
||||
source = https://github.com/facebook/zstd/archive/2555975.tar.gz
|
||||
source = libunwind.patch
|
||||
md5sums = eb7be28304b18fe3c5aaf5871bea598f
|
||||
md5sums = 9f9e710b10623453eee7d6be9b778ea8
|
||||
md5sums = 70cf5232e7053256dea81e7f7b0d1ebe
|
||||
md5sums = 5323f7ba2565a84a80a93edde95eb4fe
|
||||
md5sums = 858f1e9d37c064a1e5ce99f24ed9cf95
|
||||
md5sums = 40d91626049ab15bf3bbe75fa00bf52d
|
||||
md5sums = 211c6903a4179959f456055dbb054b05
|
||||
md5sums = cc75288aa9af1ce714ed184e0f2caaae
|
||||
md5sums = 7b92f0554687e6a8949adc5c10aeff78
|
||||
md5sums = 8a7abcc6998e461605ecb2988ff93dfc
|
||||
md5sums = 649fe83631248b1164d324aca9d85cad
|
||||
md5sums = 8cfc42d6e90721e37e0806d6fb905b09
|
||||
md5sums = bf1ee7e88660616c92592dd4c1036f61
|
||||
md5sums = e98c6b94f39d6947c83eb554aeb618e2
|
||||
md5sums = 2fa16f04d0d533cbb5797bfd45b058fd
|
||||
md5sums = b84bdd5d5d8c75c2ff5573670e05eaa9
|
||||
md5sums = d63e8036385a27113365a40eb6bfe75e
|
||||
md5sums = 305944814e6124a2b9c2e306fb02ac16
|
||||
md5sums = 2d17a2f38bd80d68f17ec529f887aa62
|
||||
md5sums = aaa86ec9f379ef587cc53f7b96bcc0e7
|
||||
md5sums = f3f60b75abf8d6f21de74db6e88e1e7b
|
||||
|
||||
pkgname = clickhouse
|
||||
|
||||
6
.gitignore
vendored
6
.gitignore
vendored
@ -41,3 +41,9 @@ ba8de79.tar.gz
|
||||
860c90e.tar.gz
|
||||
010ccf0.tar.gz
|
||||
6a96e8b.tar.gz
|
||||
05dab0e.tar.gz
|
||||
471ea20.tar.gz
|
||||
8695b9d.tar.gz
|
||||
87ac6fd.tar.gz
|
||||
9b184d8.tar.gz
|
||||
e2131aa.tar.gz
|
||||
|
||||
56
PKGBUILD
56
PKGBUILD
@ -2,39 +2,45 @@
|
||||
# Maintainer: Dmitry Bilunov <kmeaw@yandex-team.ru>
|
||||
|
||||
pkgname=clickhouse
|
||||
pkgver=19.4.0.49
|
||||
pkgver=19.5.3.8
|
||||
pkgrel=1
|
||||
pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time'
|
||||
arch=('i686' 'x86_64')
|
||||
url='https://clickhouse.yandex/'
|
||||
license=('Apache')
|
||||
depends=('arrow' 'cppkafka-git' 'zstd-static' 'jemalloc-git' 'ncurses' 'readline' 'unixodbc' 'termcap' 'double-conversion' 'capnproto' 're2' 'gtest' 'gsasl' 'libxml2' 'llvm' 'brotli' 'lld' 'clang' 'libdaemon' 'poco')
|
||||
depends=('cppkafka-git' 'jemalloc-git' 'ncurses' 'readline' 'unixodbc' 'termcap' 'double-conversion' 'capnproto' 're2' 'gtest' 'gsasl' 'libxml2' 'llvm>=8' 'brotli' 'lld' 'clang' 'libdaemon' 'poco' 'snappy')
|
||||
makedepends=('cmake' 'patchelf')
|
||||
source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz
|
||||
https://github.com/apache/arrow/archive/87ac6fd.tar.gz
|
||||
https://github.com/google/cctz/archive/4f9776a.tar.gz
|
||||
https://github.com/edenhill/librdkafka/archive/363dcad.tar.gz
|
||||
https://github.com/mfontanini/cppkafka/archive/860c90e.tar.gz
|
||||
https://github.com/edenhill/librdkafka/archive/8695b9d.tar.gz
|
||||
https://github.com/mfontanini/cppkafka/archive/9b184d8.tar.gz
|
||||
https://github.com/lz4/lz4/archive/c10863b.tar.gz
|
||||
https://github.com/Dead2/zlib-ng/archive/9173b89.tar.gz
|
||||
https://github.com/ClickHouse-Extras/boost/archive/6a96e8b.tar.gz
|
||||
https://github.com/ClickHouse-Extras/boost/archive/471ea20.tar.gz
|
||||
https://github.com/ClickHouse-Extras/ssl/archive/ba8de79.tar.gz
|
||||
https://github.com/aklomp/base64/archive/a27c565.tar.gz
|
||||
https://github.com/ClickHouse-Extras/libhdfs3/archive/bd6505c.tar.gz
|
||||
https://github.com/ClickHouse-Extras/libhdfs3/archive/e2131aa.tar.gz
|
||||
https://github.com/ClickHouse-Extras/protobuf/archive/1273537.tar.gz
|
||||
https://github.com/apache/thrift/archive/010ccf0.tar.gz
|
||||
https://github.com/ClickHouse-Extras/hyperscan/archive/05dab0e.tar.gz
|
||||
https://github.com/facebook/zstd/archive/2555975.tar.gz
|
||||
libunwind.patch)
|
||||
md5sums=('eb7be28304b18fe3c5aaf5871bea598f'
|
||||
md5sums=('9f9e710b10623453eee7d6be9b778ea8'
|
||||
'70cf5232e7053256dea81e7f7b0d1ebe'
|
||||
'5323f7ba2565a84a80a93edde95eb4fe'
|
||||
'858f1e9d37c064a1e5ce99f24ed9cf95'
|
||||
'40d91626049ab15bf3bbe75fa00bf52d'
|
||||
'211c6903a4179959f456055dbb054b05'
|
||||
'cc75288aa9af1ce714ed184e0f2caaae'
|
||||
'7b92f0554687e6a8949adc5c10aeff78'
|
||||
'8a7abcc6998e461605ecb2988ff93dfc'
|
||||
'649fe83631248b1164d324aca9d85cad'
|
||||
'8cfc42d6e90721e37e0806d6fb905b09'
|
||||
'bf1ee7e88660616c92592dd4c1036f61'
|
||||
'e98c6b94f39d6947c83eb554aeb618e2'
|
||||
'2fa16f04d0d533cbb5797bfd45b058fd'
|
||||
'b84bdd5d5d8c75c2ff5573670e05eaa9'
|
||||
'd63e8036385a27113365a40eb6bfe75e'
|
||||
'305944814e6124a2b9c2e306fb02ac16'
|
||||
'2d17a2f38bd80d68f17ec529f887aa62'
|
||||
'aaa86ec9f379ef587cc53f7b96bcc0e7'
|
||||
'f3f60b75abf8d6f21de74db6e88e1e7b')
|
||||
backup=('etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' 'etc/clickhouse-server/users.xml')
|
||||
install=$pkgname.install
|
||||
@ -43,19 +49,22 @@ prepare() {
|
||||
cd ClickHouse-$pkgver-stable
|
||||
sed -e 's/mysqlxx common\(.*\) \(\${Z_LIB}\)/mysqlxx \2 common\1/' -i libs/libmysqlxx/CMakeLists.txt
|
||||
patch -p1 < ../libunwind.patch
|
||||
mkdir -p contrib/cctz contrib/librdkafka contrib/cppkafka contrib/lz4 contrib/base64 contrib/libhdfs3 contrib/protobuf contrib/thrift
|
||||
rm -rf contrib/{cctz,librdkafka,cppkafka,lz4,zlib-ng,boost,ssl,base64,libhdfs3,protobuf,thrift}/*
|
||||
mv ../librdkafka-363dcad*/* contrib/librdkafka/
|
||||
mv ../cppkafka-860c90e*/* contrib/cppkafka/
|
||||
mkdir -p contrib/arrow contrib/cctz contrib/librdkafka contrib/cppkafka contrib/lz4 contrib/base64 contrib/libhdfs3 contrib/protobuf contrib/thrift contrib/hyperscan contrib/zstd
|
||||
rm -rf contrib/{arrow,cctz,librdkafka,cppkafka,lz4,zlib-ng,boost,ssl,base64,libhdfs3,protobuf,thrift,hyperscan,zstd}/*
|
||||
mv ../arrow-87ac6fd*/* contrib/arrow/
|
||||
mv ../librdkafka-8695b9d*/* contrib/librdkafka/
|
||||
mv ../cppkafka-9b184d8*/* contrib/cppkafka/
|
||||
mv ../cctz-4f9776a*/* contrib/cctz/
|
||||
mv ../lz4-c10863b*/* contrib/lz4/
|
||||
mv ../zlib-ng-9173b89*/* contrib/zlib-ng/
|
||||
mv ../boost-6a96e8b*/* contrib/boost/
|
||||
mv ../boost-471ea20*/* contrib/boost/
|
||||
mv ../ssl-ba8de79*/* contrib/ssl/
|
||||
mv ../base64-a27c565*/* contrib/base64/
|
||||
mv ../libhdfs3-bd6505c*/* contrib/libhdfs3/
|
||||
mv ../libhdfs3-e2131aa*/* contrib/libhdfs3/
|
||||
mv ../protobuf-1273537*/* contrib/protobuf/
|
||||
mv ../thrift-010ccf0*/* contrib/thrift/
|
||||
mv ../hyperscan-05dab0e*/* contrib/hyperscan/
|
||||
mv ../zstd-2555975*/* contrib/zstd/
|
||||
for dir in contrib/*/; do
|
||||
rmdir $dir &> /dev/null || true
|
||||
done
|
||||
@ -63,7 +72,11 @@ prepare() {
|
||||
|
||||
build() {
|
||||
cd ClickHouse-$pkgver-stable
|
||||
cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D SPLIT_SHARED_LIBRARIES:BOOL=True -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=False -D USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY:BOOL=False -D USE_INTERNAL_CAPNP_LIBRARY:BOOL=False -D USE_INTERNAL_POCO_LIBRARY:BOOL=True -D USE_INTERNAL_RE2_LIBRARY:BOOL=False -D USE_INTERNAL_LIBGSASL_LIBRARY:BOOL=False -D USE_INTERNAL_GTEST_LIBRARY:BOOL=False -D USE_INTERNAL_LIBXML2_LIBRARY:BOOL=False -D USE_INTERNAL_LLVM_LIBRARY:BOOL=False -D USE_INTERNAL_BROTLI_LIBRARY:BOOL=False -D NO_WERROR=1 -D DOUBLE_CONVERSION_ROOT_DIR=/usr -D USE_INTERNAL_PARQUET_LIBRARY:BOOL=False -D USE_INTERNAL_ZSTD_LIBRARY:BOOL=False -D USE_INTERNAL_RDKAFKA_LIBRARY:BOOL=True -D USE_RDKAFKA:BOOL=True -D USE_INTERNAL_LZ4_LIBRARY:BOOL=True -D ENABLE_JEMALLOC:BOOL=True -D USE_INTERNAL_JEMALLOC_LIBRARY:BOOL=False -D USE_BASE64:BOOL=True -D USE_INTERNAL_HDFS3_LIBRARY:BOOL=True -D ENABLE_MYSQL:BOOL=True -D USE_INTERNAL_MYSQL_LIBRARY:BOOL=False -D USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY:BOOL=False -D USE_INTERNAL_PROTOBUF_LIBRARY:BOOL=True -D USE_INTERNAL_PROTOBUF_LIBRARY:BOOL=True -D PARQUET_INCLUDE_DIR:STRING=/usr/include -D USE_INTERNAL_POCO_LIBRARY:BOOL=False .
|
||||
COMP=""
|
||||
if ! pacman -Q clang | grep '^clang 7'; then
|
||||
COMP="-D ENABLE_EMBEDDED_COMPILER=False"
|
||||
fi
|
||||
cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D SPLIT_SHARED_LIBRARIES:BOOL=True -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=False -D USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY:BOOL=False -D USE_INTERNAL_CAPNP_LIBRARY:BOOL=False -D USE_INTERNAL_POCO_LIBRARY:BOOL=True -D USE_INTERNAL_RE2_LIBRARY:BOOL=False -D USE_INTERNAL_LIBGSASL_LIBRARY:BOOL=False -D USE_INTERNAL_GTEST_LIBRARY:BOOL=False -D USE_INTERNAL_LIBXML2_LIBRARY:BOOL=False -D USE_INTERNAL_LLVM_LIBRARY:BOOL=False -D USE_INTERNAL_BROTLI_LIBRARY:BOOL=False -D NO_WERROR=1 -D DOUBLE_CONVERSION_ROOT_DIR=/usr -D USE_INTERNAL_PARQUET_LIBRARY:BOOL=False -D USE_INTERNAL_ZSTD_LIBRARY:BOOL=False -D USE_INTERNAL_RDKAFKA_LIBRARY:BOOL=True -D USE_RDKAFKA:BOOL=True -D USE_INTERNAL_LZ4_LIBRARY:BOOL=True -D ENABLE_JEMALLOC:BOOL=True -D USE_INTERNAL_JEMALLOC_LIBRARY:BOOL=False -D USE_BASE64:BOOL=True -D USE_INTERNAL_HDFS3_LIBRARY:BOOL=True -D ENABLE_MYSQL:BOOL=True -D USE_INTERNAL_MYSQL_LIBRARY:BOOL=False -D USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY:BOOL=False -D USE_INTERNAL_PROTOBUF_LIBRARY:BOOL=True -D USE_INTERNAL_PROTOBUF_LIBRARY:BOOL=True -D PARQUET_INCLUDE_DIR:STRING=/usr/include -D USE_INTERNAL_POCO_LIBRARY:BOOL=False $COMP .
|
||||
cmake --build . --target clickhouse
|
||||
}
|
||||
|
||||
@ -78,7 +91,11 @@ package() {
|
||||
patchelf --remove-rpath $pkgdir/usr/bin/clickhouse-client
|
||||
patchelf --replace-needed libz.so.1 libz-ng.so.1 $pkgdir/usr/bin/clickhouse-client
|
||||
cp dbms/programs/client/clickhouse-client.xml $pkgdir/etc/clickhouse-client/config.xml
|
||||
for lib in libclickhouse{-{benchmark,{clien,forma,performance-tes}t,{co{mp{ile,resso},pie},obfuscato,serve}r,extract-from-config,local}-lib,{_{aggregat,tabl}e,}_functions,_{com{mon_{config,io,zookeeper},pression},dictionaries{,_embedded},parsers,storage{_kafka,s_system}}}.so; do
|
||||
compiler="libclickhouse-compiler.so"
|
||||
if ! pacman -Q clang | grep '^clang 7'; then
|
||||
compiler=""
|
||||
fi
|
||||
for lib in libclickhouse{-{benchmark,{clien,forma,performance-tes}t,{co{mpresso,pie},obfuscato,serve}r,extract-from-config,local}-lib,{_{aggregat,tabl}e,}_functions,_{com{mon_{config,io,zookeeper},pression},dictionaries{,_embedded},parsers,storage{_kafka,s_system}}}.so $compiler; do
|
||||
libsrc=$(find dbms/ -name "$lib")
|
||||
libdst=$lib.$pkgver
|
||||
cp ${libsrc:?$lib not found} $pkgdir/usr/lib/$libdst
|
||||
@ -93,6 +110,7 @@ package() {
|
||||
patchelf --replace-needed $lib $libdst $pkgdir/usr/bin/clickhouse-client
|
||||
done
|
||||
cp contrib/zlib-ng/libz.so.1 $pkgdir/usr/lib/libz-ng.so.1
|
||||
cp contrib/protobuf/cmake/libprotobuf.so.3.6.1 $pkgdir/usr/lib/libprotobuf.so.3.6.1
|
||||
sed -e 's:/opt/clickhouse:/var/lib/clickhouse:g' -i $pkgdir/etc/clickhouse-server/config.xml
|
||||
sed -e '/listen_host/s%::<%::1<%' -i $pkgdir/etc/clickhouse-server/config.xml
|
||||
cp debian/clickhouse-server.service $pkgdir/usr/lib/systemd/system
|
||||
|
||||
Reference in New Issue
Block a user