summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Northon2022-06-30 21:42:56 +0200
committerMartchus2022-06-30 21:42:56 +0200
commit1227a106f007805b7200d9ee15349406f0e9c3b8 (patch)
tree3855483b854ced980489db651eba10db2e37a3a2
parentf83891fab97d94a2bf44ed3ebd815aa4a9ca69d3 (diff)
downloadaur-1227a106f007805b7200d9ee15349406f0e9c3b8.tar.gz
Pull and use a specific version of gtest
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD20
2 files changed, 17 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f71103fb9e4c..508a0f3acf8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
pkgbase = mingw-w64-rapidjson
pkgdesc = A fast JSON parser/generator for C++ with both SAX/DOM style API (mingw-w64)
pkgver = 1.1.0
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/miloyip/rapidjson
arch = any
license = MIT
checkdepends = mingw-w64-wine
- checkdepends = mingw-w64-gtest
- checkdepends = gtest
checkdepends = python
makedepends = mingw-w64-gcc
makedepends = mingw-w64-cmake
@@ -17,6 +15,8 @@ pkgbase = mingw-w64-rapidjson
options = !strip
options = !emptydirs
source = rapidjson-1.1.0.tar.gz::https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
- md5sums = badd12c511e081fec6c89c43a7027bce
+ source = git+https://github.com/google/googletest.git#commit=2fe3bd994b3189899d93f1d5a881e725e046fdc2
+ sha256sums = bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
+ sha256sums = SKIP
pkgname = mingw-w64-rapidjson
diff --git a/PKGBUILD b/PKGBUILD
index f0b34f69a9f9..99f6aae00f6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,18 @@
_reponame=rapidjson
pkgname=mingw-w64-$_reponame
pkgver=1.1.0
-pkgrel=4
+pkgrel=5
pkgdesc='A fast JSON parser/generator for C++ with both SAX/DOM style API (mingw-w64)'
arch=('any')
url='https://github.com/miloyip/rapidjson'
license=('MIT')
makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja')
-checkdepends=('mingw-w64-wine' 'mingw-w64-gtest' 'gtest' 'python')
-source=($_reponame-$pkgver.tar.gz::https://github.com/miloyip/$_reponame/archive/v$pkgver.tar.gz)
-md5sums=('badd12c511e081fec6c89c43a7027bce')
+checkdepends=('mingw-w64-wine' 'python')
+source=(
+ "$_reponame-$pkgver.tar.gz::https://github.com/miloyip/$_reponame/archive/v$pkgver.tar.gz"
+ 'git+https://github.com/google/googletest.git#commit=2fe3bd994b3189899d93f1d5a881e725e046fdc2')
+sha256sums=('bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e'
+ 'SKIP')
options=(!buildflags staticlibs !strip !emptydirs)
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@@ -39,7 +42,10 @@ build () {
-DRAPIDJSON_BUILD_CXX11=ON \
-DRAPIDJSON_ENABLE_INSTRUMENTATION_OPT=OFF \
-DCMAKE_INSTALL_PREFIX:PATH="/usr/${_arch}" \
- -DGTEST_SOURCE_DIR=/usr/src/googletest \
+ -DGTEST_SOURCE_DIR="$srcdir/googletest/googletest" \
+ -DGTEST_INCLUDE_DIR="$srcdir/googletest/googletest/include" \
+ -DINSTALL_GTEST=OFF \
+ -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=ON \
..
ninja
popd
@@ -52,8 +58,8 @@ check() {
mkdir -p "build-${_arch}" && pushd "build-${_arch}"
pushd bin
- ln -s unittest.exe unittest
- ln -s perftest.exe perftest
+ ln -sf unittest.exe unittest
+ ln -sf perftest.exe perftest
popd
WINEPATH="/usr/${_arch}/bin" ctest -j 2 -V --tests-regex '^(perftest|unittest)$'