From 90fa95507bd2653c267cbbbb1096715978589bfe Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 16 Apr 2020 00:31:21 +0200 Subject: [PATCH] tageditor: actually fix and simplify build options --- srcpkgs/tageditor/template | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template index bbdf7befc3f..4c185b9c8da 100644 --- a/srcpkgs/tageditor/template +++ b/srcpkgs/tageditor/template @@ -19,16 +19,20 @@ desc_option_webengine="Enable support for qt5-webengine file views (requires qt) desc_option_webkit="Enable support for qt5-webkit file views (requires qt)" desc_option_script="Enable support for qt5-script javascript (requires qt)" -# Prefer qt5-webengine to qt5-webkit, if it can be built case "$XBPS_TARGET_MACHINE" in - # qt5-webengine not supported on these architectures - ppc|ppc-musl|armv5tel*);; - *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then - # webengine can be built only if word size matches - webview_backend="webengine" - fi;; + x86_64*|aarch64*|armv[67]*|ppc64le*) + if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then + _use_webengine=yes + fi + ;; + *) ;; esac -build_options_default+=" ${webview_backend:-webkit}" + +if [ "$_use_webengine" ]; then + build_options_default+=" webengine" +else + build_options_default+=" webkit" +fi vopt_conflict webengine webkit