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

[David Runge]

    Date: Thursday, March 12, 2020 @ 09:37:17
  Author: dvzrv
Revision: 595080

upgpkg: nlohmann-json 3.7.3-4: Adding pkgconfig integration by (also) building/installing with meson.

Modified:
  nlohmann-json/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-12 09:14:57 UTC (rev 595079)
+++ PKGBUILD	2020-03-12 09:37:17 UTC (rev 595080)
@@ -4,7 +4,7 @@
 pkgver=3.7.3
 # upstream doesn't use annotated tags:
 _commit=e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4
-pkgrel=3
+pkgrel=4
 pkgdesc="JSON for Modern C++"
 arch=('any')
 url="https://github.com/nlohmann/json"
@@ -27,6 +27,11 @@
         -B build \
         -S .
   make VERBOSE=1 -C build
+  # create pkgconfig integration
+  meson --prefix=/usr \
+             --libdir=lib \
+             meson-build
+  ninja -C meson-build
 }
 
 check() {
@@ -36,6 +41,9 @@
 
 package() {
   cd "$pkgname-$pkgver"
+  # NOTE: installing first with meson, as it will install the single header
+  # file, but cmake will install multiple headers.
+  DESTDIR="${pkgdir}" meson install -C meson-build
   make DESTDIR="${pkgdir}" install -C build
   install -vDm 644 {CODE_OF_CONDUCT,README}.md \
     -t "${pkgdir}/usr/share/doc/${pkgname}"