Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id AF0EA7819D8 for <~alpine/aports@lists.alpinelinux.org>; Sun, 18 Aug 2019 14:34:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 35B45298D6 for <~alpine/aports@lists.alpinelinux.org>; Sun, 18 Aug 2019 16:26:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CSScn_U1t6nf; Sun, 18 Aug 2019 16:26:43 +0200 (CEST) From: Bart Ribbers DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1566138403; bh=M6kMLsXSw04Q4U0XqTWsSq1XurtME+ynh+/iymLmQvo=; h=From:To:Cc:Subject:Date; b=L11duUkaKiBQ0fWNsR79C+t3jmJkfhMN9X4dB2G6lyJgoRkvFlC36hfSzcrA94Zqh ZuU+0ufO24HSuJYup0DK6xYmx4K9YdbMm8PGX3C9nZ0VeB8P5cgP1g7PnGTUiWP4+8 Rq2xJVuUFbIZHUaUcvtpSNR5/av0iq5MNnSxJCxCy/0elgzo+cYbLA0j00tQfqhq86 xuzQ0/22eFAHRjyo2RyeuQFnbqYSl3i4VjfUC7v5K8AulrEzRFwVneVZ6blHIx4+PD IiUd/g8gPcnp5PkmK0jJQi7tm/q0FGX0PggK76x9frNpYm1HiwIt9pdG5M4wGlaeYK UsZd7n6rY1zsw== To: ~alpine/aports@lists.alpinelinux.org Cc: Bart Ribbers Subject: [PATCH 1/4] testing/nlohmann-json: upgrade to 3.7.0 Date: Sun, 18 Aug 2019 16:26:35 +0200 Message-Id: <20190818142638.9980-1-bribbers@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit --- testing/nlohmann-json/APKBUILD | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/testing/nlohmann-json/APKBUILD b/testing/nlohmann-json/APKBUILD index 01733cd9f6..b1dd0c6e23 100644 --- a/testing/nlohmann-json/APKBUILD +++ b/testing/nlohmann-json/APKBUILD @@ -1,34 +1,35 @@ # Contributor: Nick Black -# This is a headers-only implementaiton; there are no libraries. +# Maintainer: pkgname=nlohmann-json -pkgver=3.6.1 -pkgrel=1 +pkgver=3.7.0 +pkgrel=0 pkgdesc="JSON for Modern C++" url="https://github.com/nlohmann/json" arch="noarch" license="MIT" -makedepends="doxygen" -subpackages="nlohmann-json-doc" +makedepends="cmake doxygen graphviz" +subpackages="$pkgname-dev $pkgname-doc" source="nlohmann-json-$pkgver.tar.gz::https://github.com/nlohmann/json/archive/v$pkgver.tar.gz" builddir="$srcdir/json-$pkgver" build() { + cmake \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib + make make -C doc } check() { - if [ "$CARCH" != "s390x" ]; then make check-fast; fi + CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - mkdir -p "$pkgdir/usr/include" - mv include/nlohmann "$pkgdir/usr/include" -} + DESTDIR="$pkgdir" make install -doc() { - cd "$builddir" - mkdir -p "$subpkgdir/usr/share/doc/nlohmann-json" - mv README.md doc/html "$subpkgdir/usr/share/doc/nlohmann-json" + mkdir -p "$pkgdir"/usr/share/doc/$pkgname + mv doc/html "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a nlohmann-json-3.6.1.tar.gz" +sha512sums="35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d nlohmann-json-3.7.0.tar.gz" -- 2.21.0