qt5jsbackend: only available on ARM, x86, x86-64 and mipsel

The v8 Javascript virtual machine that is the core of qt5jsbackend is
only available on certain architectures. At the moment, only ARM, x86,
x86-64 and mipsel are supported.

Fixes:

  http://autobuild.buildroot.org/results/a2e/a2e62e2deaa28ec9d4d957523a00ee0b7a634950/build-end.log

[Peter: also add dependency for qt5graphicaleffects]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index f862b94bff1ed321102e150fad4430fb4d467bfc..93328650d51bd806aec1173441e111391df9cc9d 100644 (file)
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_QT5DECLARATIVE
        select BR2_PACKAGE_QT5BASE_EGLFS
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
+       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -15,4 +16,5 @@ config BR2_PACKAGE_QT5DECLARATIVE
          http://qt-project.org
 
 comment "qt5declarative requires an OpenGL-capable backend"
-       depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+       depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE

diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index 9a32bc72fcd02a19eee2284b52bb8debe8be783c..ed0454ad6c659bc971c43e1df5e6be5ed677870c 100644 (file)
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
        bool "qt5graphicaleffects"
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5DECLARATIVE
+       # qt5declarative -> qt5jsbackend
+       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
        help
@@ -13,4 +15,5 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
          http://qt-project.org
 
 comment "qt5graphicaleffects requires an OpenGL-capable backend"
-       depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+       depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE

diff --git a/package/qt5/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in
index 89d506771e79c8044898ff7d2f5f6f5d4153bd0e..2f5ac1ff51579a0c336ec3db7111826c2f91fcf8 100644 (file)
--- a/package/qt5/qt5jsbackend/Config.in
+++ b/package/qt5/qt5jsbackend/Config.in
@@ -1,6 +1,13 @@
+config BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
+       bool
+       # v8 is only available on certain architectures
+       depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+       default y
+
 config BR2_PACKAGE_QT5JSBACKEND
        bool "qt5jsbackend"
        select BR2_PACKAGE_QT5BASE
+       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.

diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index fd36672f0fb366cbadc2423f974132bf1ca0cc60..080cba22c15d3ddbb65422014155e6219ca4938f 100644 (file)
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -4,6 +4,8 @@ config BR2_PACKAGE_QT5MULTIMEDIA
        select BR2_PACKAGE_QT5DECLARATIVE
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
+       # qt5declarative -> qt5jsbackend
+       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -13,4 +15,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA
          http://qt-project.org
 
 comment "qt5multimedia requires an OpenGL-capable backend"
-       depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+       depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE

diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index 99fd5a4d80396cadad323bcec8484bec6c3aa731..65b1f621a2223a32492861be49aad6bbb997c87c 100644 (file)
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_QT5QUICK1
        depends on !BR2_PREFER_STATIC_LIB
        depends on BR2_PACKAGE_HAS_OPENGL_EGL
        depends on BR2_PACKAGE_HAS_OPENGL_ES
+       depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
        help
          Qt is a cross-platform application and UI framework for
          developers using C++.
@@ -19,4 +20,5 @@ config BR2_PACKAGE_QT5QUICK1
          http://qt-project.org
 
 comment "qt5quick1 requires an OpenGL-capable backend"
-       depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
+       depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
+               BR2_PACKAGE_QT5JSBACKEND_AVAILABLE