From 3bf4f53300e319e7349acdf979fbcbf9e3eef2e2 Mon Sep 17 00:00:00 2001 From: psykose Date: Wed, 26 Jul 2023 00:50:00 +0000 Subject: [PATCH] community/jsoncpp: modernise --- community/jsoncpp/APKBUILD | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/community/jsoncpp/APKBUILD b/community/jsoncpp/APKBUILD index 599bafcd036..96e442c0e71 100644 --- a/community/jsoncpp/APKBUILD +++ b/community/jsoncpp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=jsoncpp pkgver=1.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="JSON C++ library" url="https://github.com/open-source-parsers/jsoncpp" arch="all" @@ -11,26 +11,18 @@ subpackages="$pkgname-static $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz" build() { - # we cannot use cmake since jsoncpp is a dependency for cmake which - # means we would get circular buildtime deps abuild-meson \ --default-library=both \ - build - meson compile -C build + . output + meson compile -C output } check() { - meson test --no-rebuild --print-errorlogs -C build + meson test --no-rebuild --print-errorlogs -C output } package() { - DESTDIR="$pkgdir" meson install --no-rebuild -C build -} - -static() { - pkgdesc="JsonCpp static library" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ + DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums="