[arch-commits] Commit in rethinkdb/trunk (PKGBUILD boost_1.56_compat.patch)

[Anatol Pomozov]

    Date: Thursday, September 25, 2014 @ 20:46:26
  Author: anatolik
Revision: 119573

upgpkg: rethinkdb 1.14.1-1

Added:
  rethinkdb/trunk/boost_1.56_compat.patch
Modified:
  rethinkdb/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   20 +++++++++++++++-----
 boost_1.56_compat.patch |   13 +++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-25 17:33:12 UTC (rev 119572)
+++ PKGBUILD	2014-09-25 18:46:26 UTC (rev 119573)
@@ -4,7 +4,7 @@
 # Contributor: Sigmund Lahn <sigmund at lahn.no>
 
 pkgname=rethinkdb
-pkgver=1.14.0
+pkgver=1.14.1
 pkgrel=1
 pkgdesc='An open-source distributed database built with love.'
 arch=(i686 x86_64)
@@ -19,23 +19,33 @@
   http://download.rethinkdb.com/dist/rethinkdb-$pkgver.tgz
   rethinkdb-tmpfile.conf
   rethinkdb.service
+  boost_1.56_compat.patch
 )
-sha256sums=('fd3ee289b33c43f3f78a730dabf21cf8d025f3a1fb9cf7dcd1139249c9baae5f'
+sha256sums=('a8c3625a2cc916b17633841b2f9ce34fe18b677e3a13556fac9ac184c45a3a2f'
             '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
-            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2')
+            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
+            '1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21')
 
+prepare() {
+  cd rethinkdb-$pkgver
+  # boost 1.56 workaround https://github.com/rethinkdb/rethinkdb/issues/3044
+  rm src/unittest/print_secondary.cc
+  patch -p1 < ../boost_1.56_compat.patch
+}
+
 build() {
   cd rethinkdb-$pkgver
   export PYTHON=/usr/bin/python2
-  ./configure --fetch v8 --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
+  ./configure CXXFLAGS="-DBOOST_VARIANT_DO_NOT_USE_VARIADIC_TEMPLATES" --fetch v8 --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
   make
 }
 
 check() {
   cd rethinkdb-$pkgver
+
   make build/release/rethinkdb-unittest
   # SindexEraseRange failure https://github.com/rethinkdb/rethinkdb/issues/2042
-  ./build/release/rethinkdb-unittest --gtest_filter=-RDBBtree.SindexEraseRange
+  ./build/release/rethinkdb-unittest #--gtest_filter=-RDBBtree.SindexEraseRange
   # some tests might be flaky on btrfs filesystem!
 }
 

Added: boost_1.56_compat.patch
===================================================================
--- boost_1.56_compat.patch	                        (rev 0)
+++ boost_1.56_compat.patch	2014-09-25 18:46:26 UTC (rev 119573)
@@ -0,0 +1,13 @@
+diff --git a/src/clustering/reactor/reactor_be_primary.cc b/src/clustering/reactor/reactor_be_primary.cc
+index 3f583fc..945f78b 100644
+--- a/src/clustering/reactor/reactor_be_primary.cc
++++ b/src/clustering/reactor/reactor_be_primary.cc
+@@ -290,7 +290,7 @@ void do_backfill(
+
+ bool check_that_we_see_our_broadcaster(const boost::optional<boost::optional<broadcaster_business_card_t> > &maybe_a_
+     guarantee(maybe_a_business_card, "Not connected to ourselves\n");
+-    return maybe_a_business_card.get();
++    return static_cast<bool>(maybe_a_business_card.get());
+ }
+
+ bool reactor_t::attempt_backfill_from_peers(directory_entry_t *directory_entry,