summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjgmdev2018-02-07 02:55:56 -0400
committerjgmdev2018-02-07 02:55:56 -0400
commit6b2caeca63e7f553bcdfba80cd7b22ddac85341f (patch)
treecf5491c5c2e1c725ab0f3a93131ae32b3448f037
parent3ac9998efa10da4e521782dc8b6fc51efd4b4860 (diff)
downloadaur-6b2caeca63e7f553bcdfba80cd7b22ddac85341f.tar.gz
Fixed build issues due to gcc7.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rw-r--r--bedrock.service2
3 files changed, 18 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ac443fa32bf..3edfe71d6a10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Feb 17 21:42:30 UTC 2017
+# Wed Feb 7 06:55:12 UTC 2018
pkgbase = bedrock
pkgdesc = Rock solid distributed database specializing in active/active automatic failover and WAN replication.
- pkgver = r340.8a823b7
+ pkgver = r1318.8187835
pkgrel = 1
url = http://bedrockdb.com
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 855d1b4b46f1..6c91d09f1271 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=bedrock
_gitname=Bedrock
-pkgver=r340.8a823b7
+pkgver=r1318.8187835
pkgrel=1
pkgdesc="Rock solid distributed database specializing in active/active automatic failover and WAN replication."
url="http://bedrockdb.com"
@@ -24,6 +24,20 @@ pkgver() {
)
}
+prepare() {
+ cd "${srcdir}/${_gitname}"
+
+ # Fix compilation errors
+ sed -i "s|#include <atomic>|#include <atomic>\n#include <functional>|" \
+ libstuff/libstuff.h
+
+ sed -i "s|/mbedtls/include -Werror -Wno-unu|/mbedtls/include -Wno-unu|" \
+ Makefile
+
+ sed -i 's|"Timestamp"), 1ul)|"Timestamp"), 1ull)|' \
+ libstuff/STCPNode.cpp
+}
+
build() {
cd "${srcdir}/${_gitname}"
diff --git a/bedrock.service b/bedrock.service
index 4d9866020469..2a1d0d5ca499 100644
--- a/bedrock.service
+++ b/bedrock.service
@@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target
[Service]
Type=simple
SyslogIdentifier=bedrock
-ExecStart= /usr/bin/bedrock -db /var/lib/bedrock/bedrock.db -serverHost 0.0.0.0:8888 -nodeHost 0.0.0.0:8889 -priority 200 -pidfile /var/run/bedrock.pid -quorumCheckpoint 100 -readThreads 4 -plugins status,db,jobs,cache,mysql -v -cache 10001
+ExecStart= /usr/bin/bedrock -db /var/lib/bedrock/bedrock.db -serverHost 0.0.0.0:8888 -nodeHost 0.0.0.0:8889 -priority 200 -pidfile /var/run/bedrock.pid -quorumCheckpoint 100 -readThreads 4 -plugins db,jobs,cache,mysql -v -cache 10001
TimeoutSec=10
[Install]