[arch-commits] Commit in rethinkdb/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Tuesday, August 2, 2016 @ 18:27:39
  Author: anatolik
Revision: 184875

upgpkg: rethinkdb 2.3.4-1

Use gcc5 as rethinkdb does not compile with gcc6

Modified:
  rethinkdb/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-02 17:36:18 UTC (rev 184874)
+++ PKGBUILD	2016-08-02 18:27:39 UTC (rev 184875)
@@ -4,7 +4,7 @@
 # Contributor: Sigmund Lahn <sigmund at lahn.no>
 
 pkgname=rethinkdb
-pkgver=2.3.2
+pkgver=2.3.4
 _tag=rethinkdb-$pkgver
 pkgrel=1
 pkgdesc='Distributed powerful and scalable NoSQL database'
@@ -12,7 +12,7 @@
 url='http://www.rethinkdb.com/'
 license=(AGPL)
 depends=(protobuf ncurses curl)
-makedepends=(boost python2 wget)
+makedepends=(boost python2 wget gcc5) # gcc5 is workaround for https://github.com/rethinkdb/rethinkdb/issues/5757
 backup=(etc/rethinkdb/instances.d/default.conf)
 install=rethinkdb.install
 options=(!emptydirs)
@@ -20,18 +20,14 @@
   http://download.rethinkdb.com/dist/$_tag.tgz
   rethinkdb-tmpfile.conf
   rethinkdb.service
-  gcc6.patch::https://github.com/rethinkdb/rethinkdb/commit/cde984c20524fc12874028c1dfa41cbe1162160e.patch
 )
-sha256sums=('af8760271c63496fdeaa8de8bae834febd4b6c09a57743570b30134e9837eaac'
+sha256sums=('93a7927d1ed785d084be3b8bac3f9af2d89c86de16e003848acbe21a32a9e1a7'
             '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
-            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
-            '7fe271cd90703f2024dce8fd260713189ec97b6ead4cca47007e457a7370c47f')
+            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2')
 
 prepare() {
   cd $_tag
 
-  patch -p1 < ../gcc6.patch # https://github.com/rethinkdb/rethinkdb/issues/5757
-
   sed \
     -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
     -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
@@ -43,7 +39,7 @@
 build() {
   cd $_tag
   export PYTHON=/usr/bin/python2
-  ./configure --fetch v8 --fetch jemalloc --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
+  CXX=g++-5 ./configure --fetch v8 --fetch jemalloc --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
   make ALLOW_WARNINGS=1
 }