diff mbox

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

Message ID 1369772826-8019-1-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Headers show

Commit Message

Thomas Petazzoni May 28, 2013, 8:27 p.m. UTC
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

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt5/qt5declarative/Config.in |    4 +++-
 package/qt5/qt5jsbackend/Config.in   |    7 +++++++
 package/qt5/qt5multimedia/Config.in  |    5 ++++-
 package/qt5/qt5quick1/Config.in      |    4 +++-
 4 files changed, 17 insertions(+), 3 deletions(-)

Comments

Peter Korsgaard May 29, 2013, 7:28 p.m. UTC | #1
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

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

 Thomas> Fixes:

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

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/qt5/qt5declarative/Config.in |    4 +++-
 Thomas>  package/qt5/qt5jsbackend/Config.in   |    7 +++++++
 Thomas>  package/qt5/qt5multimedia/Config.in  |    5 ++++-
 Thomas>  package/qt5/qt5quick1/Config.in      |    4 +++-

You seem to have forgotten qt5graphicaleffects, which also selects
qt5declarative.

Committed with that fixed, thanks.
Thomas Petazzoni May 29, 2013, 7:47 p.m. UTC | #2
Dear Peter Korsgaard,

On Wed, 29 May 2013 21:28:44 +0200, Peter Korsgaard wrote:

> You seem to have forgotten qt5graphicaleffects, which also selects
> qt5declarative.

Gaah, right. Seems like there's some hole in my grep :)

Thomas
diff mbox

Patch

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index f862b94..9332865 100644
--- 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/qt5jsbackend/Config.in b/package/qt5/qt5jsbackend/Config.in
index 89d5067..2f5ac1f 100644
--- 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 fd36672..080cba2 100644
--- 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 99fd5a4..65b1f62 100644
--- 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