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

[Jan de Groot]

    Date: Thursday, March 23, 2017 @ 22:57:44
  Author: jgc
Revision: 218559

upgpkg: rethinkdb 2.3.5-5

Build with OpenSSL 1.0, pass LDFLAGS and CXXFLAGS
Resulting package will need testing, ld complains about linking two versions of OpenSSL

Modified:
  rethinkdb/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-23 20:45:48 UTC (rev 218558)
+++ PKGBUILD	2017-03-23 22:57:44 UTC (rev 218559)
@@ -6,12 +6,12 @@
 pkgname=rethinkdb
 pkgver=2.3.5
 _tag=rethinkdb-$pkgver
-pkgrel=4
+pkgrel=5
 pkgdesc='Distributed powerful and scalable NoSQL database'
 arch=(i686 x86_64)
 url='http://www.rethinkdb.com/'
 license=(AGPL)
-depends=(protobuf ncurses curl)
+depends=(protobuf ncurses curl openssl-1.0)
 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
@@ -36,12 +36,13 @@
     -i scripts/*.py external/v8_*/tools/*.py
   sed -e 's|exec python|exec python2|g' -i external/v8_*/build/gyp/gyp
   sed -e 's|\bpython\b|python2|g' -i external/v8_*/{Makefile,*/*.gyp,*/*.gypi,*/*/*.gyp}
+
 }
 
 build() {
   cd $_tag
   export PYTHON=/usr/bin/python2
-  CXX=g++-5 ./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 --localstatedir=/var CXXFLAGS="$CXXFLAGS -I/usr/include/openssl-1.0" LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0"
   make ALLOW_WARNINGS=1
 }