From c5c7ce260b97e52c922417fd3f2017727b77cdbc Mon Sep 17 00:00:00 2001 From: Leo <thinkabit.ukim@gmail.com> Date: Mon, 13 Apr 2020 20:50:04 -0300 Subject: [PATCH] testing/choqok: fix location of cmake modules --- testing/choqok/APKBUILD | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/testing/choqok/APKBUILD b/testing/choqok/APKBUILD index 8711aba840c0..abb730263d6f 100644 --- a/testing/choqok/APKBUILD +++ b/testing/choqok/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=choqok pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="A micro-blogging client" url="https://choqok.kde.org/" arch="all !armhf" @@ -16,19 +16,27 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/choqok/${pkgver%.*}/src/choqok-$pkgver.tar.xz" build() { - cmake -B "$builddir"/build \ + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_INSTALL_LIBDIR=lib \ + $CMAKE_CROSSOPTS . make -C build } check() { + cd build CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { DESTDIR="$pkgdir" make -C build install + + mkdir -p "$pkgdir"/usr/lib + mv "$pkgdir"/usr/share/cmake "$pkgdir"/usr/lib } sha512sums="6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96 choqok-1.7.0.tar.xz" -- GitLab