aboutsummaryrefslogtreecommitdiff
path: root/package/qt/Config.in
diff options
context:
space:
mode:
authorGravatar Vicente Olivert Riera <Vincent.Riera@imgtec.com>2014-12-04 16:59:59 +0000
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-01-10 18:24:06 +0100
commit4eedd313cf1180c125ad49aadee797d2e8d05234 (patch)
tree769462d940bddedc97ec065262012001c19d1ce7 /package/qt/Config.in
parent054269ac0e624aa74f45b5f7a43cbc74b310e299 (diff)
downloadbuildroot-4eedd313cf1180c125ad49aadee797d2e8d05234.tar.gz
buildroot-4eedd313cf1180c125ad49aadee797d2e8d05234.tar.bz2
qt: split script and webkit supported arches in two different variables
Currently in Buildroot we have a BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT variable indicating which architectures support Qt Webkit. We also make Qt Script depending on that variable, so we are assuming that Qt Script is supported for exactly the same architectures which support Qt Webkit, and that's not true. For instance, Qt Webkit is not supported for MIPS64 when using the n32 ABI, but Qt Script is actually supported. So, if we make BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT depending on !BR2_MIPS_NABI32 we will also disable Qt Script, because as I said before, Qt Script depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT, and we don't want that because Qt Script works. We fix this by creating another variable called BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT to state which architectures support Qt Script, so now we can differentiate them from the ones supporting Qt Webkit. Related: http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt/Config.in')
-rw-r--r--package/qt/Config.in23
1 files changed, 17 insertions, 6 deletions
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 543d8070b7..44710f52e6 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -364,10 +364,12 @@ config BR2_PACKAGE_QT_NETWORK
config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
bool
# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
- default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
- BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \
- BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \
- BR2_sparc || BR2_x86_64
+ # see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
+ default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \
+ BR2_microblazebe || BR2_mips || BR2_mipsel || \
+ (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \
+ BR2_powerpc64 || BR2_powerpc64el || BR2_sh4 || BR2_sh4eb || \
+ BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
config BR2_PACKAGE_QT_WEBKIT
bool "WebKit Module"
@@ -401,9 +403,18 @@ config BR2_PACKAGE_QT_OPENSSL
target.
If unsure, say n.
+config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
+ bool
+ # see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
+ default y if BR2_arm || BR2_armeb || aarch64 || BR2_i386 || \
+ BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \
+ BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \
+ BR2_powerpc64 || BR2_powerpc64el || BR2_sh4 || BR2_sh4eb || \
+ BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
+
config BR2_PACKAGE_QT_SCRIPT
bool "Script Module"
- depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
+ depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np()
default y
help
@@ -412,7 +423,7 @@ config BR2_PACKAGE_QT_SCRIPT
comment "Script Module needs a toolchain with NPTL"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
- depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
+ depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
config BR2_PACKAGE_QT_SCRIPTTOOLS
bool "Script Tools Module"