Date: Thursday, August 6, 2020 @ 17:17:43 Author: dvzrv Revision: 671187
upgpkg: nlohmann-json 3.9.1-1: Upgrade to 3.9.1. Simplify fix for package reproducibility by disabling some tests. Drop now included patch. Modified: nlohmann-json/trunk/PKGBUILD ----------+ PKGBUILD | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-06 16:44:10 UTC (rev 671186) +++ PKGBUILD 2020-08-06 17:17:43 UTC (rev 671187) @@ -5,7 +5,7 @@ # upstream doesn't use annotated tags _commit=d34771cafc87b358ba421faca28facc7f8080174 pkgname=nlohmann-json -pkgver=3.9.0 +pkgver=3.9.1 pkgrel=1 pkgdesc="JSON for Modern C++" arch=('any') @@ -13,13 +13,10 @@ license=('MIT') makedepends=('cmake' 'git') source=("${pkgname}::git+https://github.com/nlohmann/json#commit=${_commit}?signed" - "${pkgname}-3.9.0-test_install.patch::https://github.com/nlohmann/json/pull/2318/commits/aa06a4761e24e59ceaa00e81be450b4d9a0c4d26.patch" "json_test_data-${_test_pkgver}.tar.gz::https://github.com/nlohmann/json_test_data/archive/v${_test_pkgver}.tar.gz") sha512sums=('SKIP' - '7311d190d1b721379f0357627b4a9648166c1fa8be6f88cf0e372ac0fe2ef85bbcce436883b9711abb29f27ba82bd79fc5d35de7c4e20004c6e779e07fc1d97a' 'd9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891') b2sums=('SKIP' - '7c4b7821dbea71f8ad6c73ba794da3e870327a8572e1587dfd05b8ddf47af80d8db119c6ff4eb257680d9378571b44cb22d90c57107dfb0145d553834112e121' 'f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d') validpgpkeys=('797167AE41C0A6D9232E48457F3CEA63AE251B69') # Niels Lohmann <m...@nlohmann.me> @@ -27,7 +24,9 @@ mkdir -vp "$pkgname/build" mv -v "json_test_data-${_test_pkgver}/" "$pkgname/build/json_test_data/" cd "$pkgname" - patch -Np1 -i "../${pkgname}-3.9.0-test_install.patch" + # remove tests that make the package non-reproducible + # https://github.com/nlohmann/json/issues/2324 + sed -e '/add_subdirectory/d' -i test/CMakeLists.txt } build() { @@ -42,23 +41,11 @@ -B build \ -S . make VERBOSE=1 -C build - # do a separate build because the tests interfere with the output directory - # https://github.com/nlohmann/json/issues/2324 - 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-test \ - -S . - make VERBOSE=1 -C build-test } check() { cd "${pkgname}" - make -k test -C build-test + make -k test -C build } package() {