Use gcc6 for building clickhouse

1 files changed, 9 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b19aa4cf2fb9..d6e445f5a5b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,30 @@
 # Maintainer: Dmitry Bilunov <kmeaw@yandex-team.ru>
 
 pkgname=clickhouse
-pkgver=1.1.54231
+pkgver=1.1.54236
 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=('ncurses' 'readline' 'unixodbc' 'termcap')
-makedepends=('poco' 'cmake' 'gcc>=6.2')
+makedepends=('poco' 'cmake' 'gcc6')
 source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz
         clickhouse-server.service
-        clickhouse-mongodb.patch
-        https://gist.github.com/kmeaw/bf6703543421abb68e0c524c1f48026f/raw/a2afde429cd795103fc2511ba31ada98c31d7b5d/clickhouse-lz4.patch)
-md5sums=('32f49d54c8482ff1e17e13f33514eaa3'
+        re2-length.patch)
+md5sums=('78083caddfdc9b2fead32d11ea8609b8'
          'f9f5663b0a9a58e99f481efe9d193e85'
-         '127966b32939673fa0b695f0360555b0'
-         'ba6a4ec1c6b9040f1ff27bb18d998fb7')
+         '143f0146c3ef3a6832191fba352b70c4')
 backup=('etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' 'etc/clickhouse-server/users.xml')
 install=$pkgname.install
 
 build() {
   cd ClickHouse-$pkgver-stable
   sed -e 's/mysqlxx common\(.*\) \(\${Z_LIB}\)/mysqlxx \2 common\1/' -i libs/libmysqlxx/CMakeLists.txt
-  patch -p1 < ../clickhouse-mongodb.patch
-  patch -p1 < ../clickhouse-lz4.patch
-  cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=True .
+  patch -p1 < ../re2-length.patch
+  export CC=gcc-6
+  export CXX=g++-6
+  cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=False .
   make clickhouse
 }