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

[David Runge]

    Date: Sunday, August 1, 2021 @ 19:44:36
  Author: dvzrv
Revision: 991991

upgpkg: nlohmann-json 3.9.1-4: Rebuild to fix pkgconfig integration.

The pkgconfig file points to /usr/local/include if the test suite is run:
https://github.com/nlohmann/json/issues/2907
https://bugs.archlinux.org/task/71086

Modified:
  nlohmann-json/trunk/PKGBUILD

----------+
 PKGBUILD |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-01 18:30:09 UTC (rev 991990)
+++ PKGBUILD	2021-08-01 19:44:36 UTC (rev 991991)
@@ -4,7 +4,7 @@
 # upstream doesn't use annotated tags
 _commit=db78ac1d7716f56fc9f1b030b715f872f93964e4 # v3.9.1
 pkgver=3.9.1
-pkgrel=3
+pkgrel=4
 # tests are tracked in a separate repo
 _test_pkgver=3.0.0
 pkgdesc="JSON for Modern C++"
@@ -21,32 +21,39 @@
 validpgpkeys=('797167AE41C0A6D9232E48457F3CEA63AE251B69') # Niels Lohmann <mail at nlohmann.me>
 
 prepare() {
-  mkdir -vp "$pkgname/build"
-  mv -v "json_test_data-${_test_pkgver}/" "$pkgname/build/json_test_data/"
+  cp -av "${pkgname}" "${pkgname}-test"
+  mkdir -vp "${pkgname}-test/build"
+  mv -v "json_test_data-${_test_pkgver}/" "${pkgname}-test/build/json_test_data/"
 }
 
 build() {
-  cd "$pkgname"
   cmake -DCMAKE_INSTALL_PREFIX='/usr' \
         -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
-        -DCMAKE_INSTALL_INCLUDEDIR='/usr/include' \
         -DCMAKE_BUILD_TYPE='None' \
+        -DJSON_MultipleHeaders=ON \
+        -Wno-dev \
+        -B "$pkgname/build" \
+        -S "$pkgname"
+  make VERBOSE=1 -C "$pkgname/build"
+
+  cmake -DCMAKE_INSTALL_PREFIX='/usr' \
+        -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
+        -DCMAKE_BUILD_TYPE='None' \
         -DBUILD_TESTING=ON \
         -DJSON_BuildTests=ON \
         -DJSON_MultipleHeaders=ON \
         -Wno-dev \
-        -B build \
-        -S .
-  make VERBOSE=1 -C build
+        -B "$pkgname-test/build" \
+        -S "$pkgname-test"
+  make VERBOSE=1 -C "$pkgname-test/build"
 }
 
 check() {
-  cd "${pkgname}"
-  make -k test -C build
+  make -k test -C "${pkgname}-test/build"
 }
 
 package() {
-  cd "$pkgname"
+  cd "${pkgname}"
   make DESTDIR="${pkgdir}" install -C build
   install -vDm 644 {CODE_OF_CONDUCT,README}.md \
     -t "${pkgdir}/usr/share/doc/${pkgname}"