aboutsummaryrefslogtreecommitdiffstats
path: root/community/calindori
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-02-20 18:36:20 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2020-02-21 18:12:22 +0100
commitc7a1f20490e2882233bfdfa682040d3cb0ffd967 (patch)
treea2b7e4154d67dc0ad64867ff7507b2883604688b /community/calindori
parent20b13d17d07ee2958a377d95f3ad14826ff9ddf9 (diff)
downloadaports-c7a1f20490e2882233bfdfa682040d3cb0ffd967.tar.bz2
aports-c7a1f20490e2882233bfdfa682040d3cb0ffd967.tar.xz
community/*: make CMake and meson respect our C{,PP,XX}FLAGS
See: https://lists.alpinelinux.org/~alpine/devel/%3C2896c13070c508a49cbaa72c8fb7f34ea947358b.camel%40cogitri.dev%3E
Diffstat (limited to 'community/calindori')
-rw-r--r--community/calindori/APKBUILD8
1 files changed, 7 insertions, 1 deletions
diff --git a/community/calindori/APKBUILD b/community/calindori/APKBUILD
index 1b7d504216..c1d1d362a3 100644
--- a/community/calindori/APKBUILD
+++ b/community/calindori/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=calindori
pkgver=1.1
-pkgrel=0
+pkgrel=1
pkgdesc="Calendar for Plasma Mobile"
arch="all !armhf" # armhf blocked by qt5-qtdeclarative
url="https://invent.kde.org/kde/calindori"
@@ -14,8 +14,14 @@ options="!check" # No tests
builddir="$srcdir/$pkgname-v$pkgver"
build() {
+<<<<<<< HEAD
cmake -B "$builddir"/build \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+=======
+ cd "$builddir"/build
+ cmake "$builddir" \
+ -DCMAKE_BUILD_TYPE=None \
+>>>>>>> community/*: use None buildtype for CMake and plain buildtype for Meson
-DCMAKE_INSTALL_PREFIX=/usr
make -C build
}