From 09595036250ecaf53a711fd420fbde019af6da16 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 4 Feb 2019 22:29:44 +0100 Subject: [PATCH] Do not use the toolchain file from Android NDK for kirigami2 It adds dubious iinker flags and use of -fundinwd-tables instead of -fexceptions prevents exceptions to work. --- kirigami2/android-aarch64/PKGBUILD | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kirigami2/android-aarch64/PKGBUILD b/kirigami2/android-aarch64/PKGBUILD index 5f62a4de..05b800f5 100644 --- a/kirigami2/android-aarch64/PKGBUILD +++ b/kirigami2/android-aarch64/PKGBUILD @@ -35,12 +35,9 @@ prepare() { build() { cd build - # note: using toolchain file from Android NDK to work around https://gitlab.kitware.com/cmake/cmake/issues/18739 - # (variables "ANDROID_ABI" and "ANDROID_PLATFORM" are for Android NDK provided toolchain file) + # note: needs workaround for https://gitlab.kitware.com/cmake/cmake/issues/18739 (currently provided outside of the PKGBUILD itself) + cmake ../$_pkgname-$pkgver \ - -DANDROID_ABI=$_android_arch \ - -DANDROID_PLATFORM=$_android_platform \ - -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=$_android_platform \ -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \