summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Edgecombe2018-05-23 21:11:27 +0100
committerGraham Edgecombe2018-05-23 21:11:27 +0100
commit1ccda251b1b64a9c74b500df16dbdaf98973efaa (patch)
treeafcbd1883cc68c29fdc322b9d03eb57e8c90c28d
parent8e3fc78670556f0b909b667de07b4421f428c190 (diff)
downloadaur-1ccda251b1b64a9c74b500df16dbdaf98973efaa.tar.gz
Use patched version of rapidjson to fix GCC 8.1 build errors
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a72df2879c90..c9778bc8473c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
/pkg
/discord-rpc
/openrct2-git
+/rapidjson
*.tar
*.tar.xz
*.tar.xz.sig
diff --git a/PKGBUILD b/PKGBUILD
index ac08e1200e40..6e612adcbc96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,10 @@ conflicts=('openrct2')
provides=('openrct2')
install=openrct2.install
source=("$pkgname"::'git+https://github.com/OpenRCT2/OpenRCT2.git#branch=develop'
- 'discord-rpc::git+https://github.com/discordapp/discord-rpc.git')
+ 'discord-rpc::git+https://github.com/discordapp/discord-rpc.git'
+ 'rapidjson::git+https://github.com/janisozaur/rapidjson.git#branch=patch-1')
sha256sums=('SKIP'
+ 'SKIP'
'SKIP')
pkgver() {
@@ -30,6 +32,8 @@ pkgver() {
prepare() {
cd "$srcdir/$pkgname"
ln -sf "$srcdir/discord-rpc" discord-rpc
+ mkdir -p discord-rpc/thirdparty
+ ln -sf "$srcdir/rapidjson" discord-rpc/thirdparty/rapidjson
}
build() {