From d4e0acf37c7170f7bf22bed3fdad059eb193280f Mon Sep 17 00:00:00 2001 From: psykose Date: Fri, 14 Oct 2022 12:50:55 +0000 Subject: [PATCH] main/bctoolbox: build with samurai --- main/bctoolbox/APKBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD index 7f3693937cc..8726584978e 100644 --- a/main/bctoolbox/APKBUILD +++ b/main/bctoolbox/APKBUILD @@ -2,18 +2,18 @@ # Maintainer: Francesco Colista pkgname=bctoolbox pkgver=5.1.55 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone" url="https://github.com/BelledonneCommunications/bctoolbox" arch="all" license="GPL-2.0-or-later" options="!check" # bcunit not available -makedepends="cmake mbedtls-dev" +makedepends="cmake mbedtls-dev samurai" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz" build() { - cmake \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_MODULE_PATH=/usr/lib/cmake \ @@ -23,16 +23,16 @@ build() { -DENABLE_POLARSSL=NO \ -DENABLE_STATIC=NO \ -DENABLE_TESTS_COMPONENT=OFF \ - -DENABLE_SHARED=YES . - make + -DENABLE_SHARED=YES + cmake --build build } check() { - make check + ctest --test-dir build --output-on-failure } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } dev() { @@ -40,9 +40,7 @@ dev() { mkdir -p "$subpkgdir"/usr/lib/cmake/bctoolbox mv "$pkgdir"/usr/share/bctoolbox/cmake/* "$subpkgdir"/usr/lib/cmake/bctoolbox # Remove empty dirs - rmdir "$pkgdir"/usr/share/bctoolbox/cmake - rmdir "$pkgdir"/usr/share/bctoolbox - rmdir "$pkgdir"/usr/share + rmdir -p "$pkgdir"/usr/share/bctoolbox/cmake || true } sha512sums="