fix build

3 files changed, 70 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7691bbef501..d4c4aa20f979 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,39 @@
 pkgbase = rethinkdb
 	pkgdesc = Distributed NoSQL database for realtime applications
 	pkgver = 2.4.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.rethinkdb.com
 	install = rethinkdb.install
 	arch = x86_64
 	license = Apache
+	makedepends = clang
+	makedepends = protobuf
 	makedepends = boost
+	makedepends = jemalloc
+	makedepends = git
 	makedepends = python2
-	makedepends = clang
+	makedepends = make
 	depends = protobuf
 	depends = curl
 	noextract = node-v6.11.0.tar.gz
 	options = !emptydirs
 	backup = etc/rethinkdb/instances.d/default.conf
-	source = https://download.rethinkdb.com/dist/rethinkdb-2.4.0.tgz
+	source = rethinkdb::git+https://github.com/rethinkdb/rethinkdb.git#commit=3ca96904192806817c73c3d533d774585ef90759
 	source = https://nodejs.org/dist/v6.11.0/node-v6.11.0.tar.gz
 	source = rethinkdb@.service
 	source = rethinkdb.sysusers.d
 	source = rethinkdb.tmpfiles.d
 	source = mksnapshot_crash_fix.patch
 	source = v8_g++7_build_fix.patch::https://github.com/nodejs/node/commit/66c1197f3aefd5b9f36533e6b617f2046acc2c0f.patch
-	sha512sums = a0301f4eee6652307ca8481a658b4494fa2b3d2151ab14afca94f50d004271be51cb487a082944c1803473086d60282fdcc53c24e793f7051088d2a3596cf1fe
+	source = build_fix.patch
+	sha512sums = SKIP
 	sha512sums = a298232f6393735f2d459eb23f78089dd7eb1bae4907dfe61b286ceb8f93d3131c2dd45f09643089d00e2a4bef0f35739c9c8984f88b34c0ab515793f38eda46
 	sha512sums = d0e86e86010fafcfdad7a58fe9ed9e93deefb1ab803aa283f60cccaf7a0ee11990c59b9ab01872b1c97b08418d7b53064e938b428e50a310442b32aa385277d9
 	sha512sums = cab680a7e765e0a844b72ab3a57f19f3268d9a717bbe19230bd79537f0424179a56037c368326d2173a4a9cde075a67c85ce9b5a32733afb7d44806df1eac0ac
 	sha512sums = 112bc0f9ecfdfae6efba5d8cc3f773085b3f345d33d350188dc70609c425e6c656a0a3069ae5c66cdc684a94fd442e990a88c0ca8d1875f085f660c76c3d7250
 	sha512sums = 8deea735b2c7b6fc0221a49e818d4347869330fa9e35a94c15d54f7bc64ac0b8a573906fea6cc64c05a177f3065c96d8b4d0e2a3724b6137d7f12ba7a7b419f7
 	sha512sums = 15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d
+	sha512sums = c5199d545ad4c77523b39a30c3b859c03261910c3226dfdf6c0d73c491ee96190745bc09ec349c49c4f41c7c52da9c2e59b9456a32bfe8d4aa78c1e29dd486bc
 
 pkgname = rethinkdb
 
diff --git a/PKGBUILD b/PKGBUILD
index c1870550fb1b..8486dc63c50c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,65 +7,78 @@
 pkgname=rethinkdb
 pkgver=2.4.0
 _node=6.11.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Distributed NoSQL database for realtime applications'
 arch=(x86_64)
 url=https://www.rethinkdb.com
 license=(Apache)
 depends=(protobuf curl)
-makedepends=(boost python2 clang)
+makedepends=(clang protobuf boost jemalloc git python2 make)
 backup=(etc/rethinkdb/instances.d/default.conf)
 install=rethinkdb.install
 options=(!emptydirs)
 source=(
-  https://download.rethinkdb.com/dist/$pkgname-$pkgver.tgz
+  $pkgname::git+https://github.com/rethinkdb/rethinkdb.git#commit=3ca96904192806817c73c3d533d774585ef90759
   https://nodejs.org/dist/v$_node/node-v$_node.tar.gz
   rethinkdb@.service
   rethinkdb.sysusers.d
   rethinkdb.tmpfiles.d
   mksnapshot_crash_fix.patch
   v8_g++7_build_fix.patch::https://github.com/nodejs/node/commit/66c1197f3aefd5b9f36533e6b617f2046acc2c0f.patch
+  build_fix.patch
 )
 noextract=(node-v$_node.tar.gz)
-sha512sums=('a0301f4eee6652307ca8481a658b4494fa2b3d2151ab14afca94f50d004271be51cb487a082944c1803473086d60282fdcc53c24e793f7051088d2a3596cf1fe'
+sha512sums=('SKIP'
             'a298232f6393735f2d459eb23f78089dd7eb1bae4907dfe61b286ceb8f93d3131c2dd45f09643089d00e2a4bef0f35739c9c8984f88b34c0ab515793f38eda46'
             'd0e86e86010fafcfdad7a58fe9ed9e93deefb1ab803aa283f60cccaf7a0ee11990c59b9ab01872b1c97b08418d7b53064e938b428e50a310442b32aa385277d9'
             'cab680a7e765e0a844b72ab3a57f19f3268d9a717bbe19230bd79537f0424179a56037c368326d2173a4a9cde075a67c85ce9b5a32733afb7d44806df1eac0ac'
             '112bc0f9ecfdfae6efba5d8cc3f773085b3f345d33d350188dc70609c425e6c656a0a3069ae5c66cdc684a94fd442e990a88c0ca8d1875f085f660c76c3d7250'
             '8deea735b2c7b6fc0221a49e818d4347869330fa9e35a94c15d54f7bc64ac0b8a573906fea6cc64c05a177f3065c96d8b4d0e2a3724b6137d7f12ba7a7b419f7'
-            '15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d')
+            '15f1f9508adef9cd14320b6649f3b766a0dd8dd478290424e9af6343a7fd64e246aafbbf2f19109e5812decb2f15dcb283fec57875bc50a540737441a0fd248d'
+            'c5199d545ad4c77523b39a30c3b859c03261910c3226dfdf6c0d73c491ee96190745bc09ec349c49c4f41c7c52da9c2e59b9456a32bfe8d4aa78c1e29dd486bc')
 
 prepare() {
   # There are a ton of hard dependencies on Python 2
   # Let's KISS and pretend `python` points to Python 2
-  mkdir bin
-  ln -s /usr/bin/python2 bin/python
 
-  cd $pkgname-$pkgver
+  if [ ! -f bin/python ]
+  then
+    mkdir -p bin
+    ln -s /usr/bin/python2 bin/python
+  fi
+
+  cd $pkgname
 
   patch -p0 < ../mksnapshot_crash_fix.patch
+  patch -p1 < ../build_fix.patch
 
   PATH="$srcdir"/bin:$PATH ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --allow-fetch
+    --dynamic jemalloc \
+    --allow-fetch \
+    --fetch npm \
+    CXX=clang++
 
   # Manually fetch the Node version used, so we can patch it
-  cd external
-  tar zxfp ../../node-v$_node.tar.gz
-  mv node{-v,_}$_node
-  cd node_$_node
-  patch -p1 < "$srcdir"/v8_g++7_build_fix.patch
+  if [ ! -d external/node_$_node ]
+  then
+    cd external
+    tar zxfp ../../node-v$_node.tar.gz
+    mv node{-v,_}$_node
+    cd node_$_node
+    patch -p1 < "$srcdir"/v8_g++7_build_fix.patch
+  fi
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   PATH="$srcdir"/bin:$PATH make -j`nproc`
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/etc/init.d
diff --git a/build_fix.patch b/build_fix.patch
new file mode 100644
index 000000000000..219a51c464d1
--- /dev/null
+++ b/build_fix.patch
@@ -0,0 +1,31 @@
+diff --git a/src/clustering/immediate_consistency/history.hpp b/src/clustering/immediate_consistency/history.hpp
+index 1c0568866d..6dcfac1901 100644
+--- a/src/clustering/immediate_consistency/history.hpp
++++ b/src/clustering/immediate_consistency/history.hpp
+@@ -4,6 +4,7 @@
+ 
+ #include <map>
+ #include <set>
++#include <stdexcept>
+ 
+ #include "concurrency/signal.hpp"
+ #include "containers/uuid.hpp"
+diff --git a/src/crypto/random.cc b/src/crypto/random.cc
+index 8f7381b6c7..3939a4f40c 100644
+--- a/src/crypto/random.cc
++++ b/src/crypto/random.cc
+@@ -1,10 +1,14 @@
+ // Copyright 2010-2016 RethinkDB, all rights reserved.
++#include <stdlib.h>
++#include <sys/types.h>
++
+ #include "crypto/random.hpp"
+ 
+ #include <openssl/rand.h>
+ 
+ #include "crypto/error.hpp"
+ 
++
+ namespace crypto {
+ 
+ void detail::random_bytes(unsigned char *data, size_t size) {