* [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies
@ 2013-12-30 9:34 Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 2/3] qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE Fatih Aşıcı
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fatih Aşıcı @ 2013-12-30 9:34 UTC (permalink / raw)
To: buildroot
This will be used by other qt packages that contain a copy of
JavaScriptCore.
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/Config.in | 8 ++++++++
package/qt5/qt5declarative/Config.in | 12 ++----------
package/qt5/qt5graphicaleffects/Config.in | 4 ++--
package/qt5/qt5multimedia/Config.in | 4 ++--
package/qt5/qt5quick1/Config.in | 4 ++--
package/qt5/qt5quickcontrols/Config.in | 4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 0f89019..b62a810 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -1,3 +1,11 @@
+config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+ bool
+ # Javascript engine is only available on certain architectures
+ depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+ # ARM needs BLX, so v5t+
+ depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+ default y
+
comment "Qt5 needs a toolchain w/ wchar, IPv6, threads, C++"
depends on !BR2_PACKAGE_QT
depends on !BR2_avr32
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index a1fb9a3..c5753b1 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -1,11 +1,3 @@
-config BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
- bool
- # Javascript engine is only available on certain architectures
- depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
- # ARM needs BLX, so v5t+
- depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
- default y
-
config BR2_PACKAGE_QT5DECLARATIVE
bool "qt5declarative"
select BR2_PACKAGE_QT5XMLPATTERNS
@@ -14,7 +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_QT5DECLARATIVE_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -25,4 +17,4 @@ config BR2_PACKAGE_QT5DECLARATIVE
comment "qt5declarative requires an OpenGL-capable backend"
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
- BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index 4958586..f4029e9 100644
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
bool "qt5graphicaleffects"
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5DECLARATIVE
- depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
depends on BR2_PACKAGE_HAS_OPENGL_EGL
depends on BR2_PACKAGE_HAS_OPENGL_ES
help
@@ -15,4 +15,4 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
comment "qt5graphicaleffects requires an OpenGL-capable backend"
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
- BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index 62373e4..53b7f86 100644
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_QT5MULTIMEDIA
select BR2_PACKAGE_QT5DECLARATIVE
depends on BR2_PACKAGE_HAS_OPENGL_EGL
depends on BR2_PACKAGE_HAS_OPENGL_ES
- depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -15,4 +15,4 @@ config BR2_PACKAGE_QT5MULTIMEDIA
comment "qt5multimedia requires an OpenGL-capable backend"
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
- BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index d3c71e3..1a0b8bf 100644
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -10,7 +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_QT5DECLARATIVE_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -20,6 +20,6 @@ config BR2_PACKAGE_QT5QUICK1
http://qt-project.org
comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend"
- depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES || \
BR2_PREFER_STATIC_LIB
diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 2651328..e72f2a4 100644
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_NETWORK
select BR2_PACKAGE_QT5DECLARATIVE
- depends on BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
depends on BR2_PACKAGE_HAS_OPENGL_EGL
depends on BR2_PACKAGE_HAS_OPENGL_ES
help
@@ -16,4 +16,4 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
comment "qt5quickcontrols requires an OpenGL-capable backend"
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
- BR2_PACKAGE_QT5DECLARATIVE_AVAILABLE
+ BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--
1.8.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/3] qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
2013-12-30 9:34 [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Fatih Aşıcı
@ 2013-12-30 9:34 ` Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 3/3] qt5webkit: " Fatih Aşıcı
2013-12-30 23:10 ` [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fatih Aşıcı @ 2013-12-30 9:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5script/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in
index 3c5d60c..f755d1e 100644
--- a/package/qt5/qt5script/Config.in
+++ b/package/qt5/qt5script/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_QT5SCRIPT
bool "qt5script"
select BR2_PACKAGE_QT5BASE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for
developers using C++.
--
1.8.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] qt5webkit: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
2013-12-30 9:34 [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 2/3] qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE Fatih Aşıcı
@ 2013-12-30 9:34 ` Fatih Aşıcı
2013-12-30 23:10 ` [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fatih Aşıcı @ 2013-12-30 9:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5webkit/Config.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in
index 4a578ff..3a58566 100644
--- a/package/qt5/qt5webkit/Config.in
+++ b/package/qt5/qt5webkit/Config.in
@@ -8,8 +8,7 @@ config BR2_PACKAGE_QT5WEBKIT
select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
# This module does not support static linking
depends on !BR2_PREFER_STATIC_LIB
- # This package is not supported on MIPS 64-bit architecture
- depends on !BR2_mips64 && !BR2_mips64el
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for
developers using C++.
--
1.8.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies
2013-12-30 9:34 [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 2/3] qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 3/3] qt5webkit: " Fatih Aşıcı
@ 2013-12-30 23:10 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2013-12-30 23:10 UTC (permalink / raw)
To: buildroot
Dear Fatih A??c?,
On Mon, 30 Dec 2013 11:34:15 +0200, Fatih A??c? wrote:
> This will be used by other qt packages that contain a copy of
> JavaScriptCore.
>
> Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
> ---
> package/qt5/Config.in | 8 ++++++++
> package/qt5/qt5declarative/Config.in | 12 ++----------
> package/qt5/qt5graphicaleffects/Config.in | 4 ++--
> package/qt5/qt5multimedia/Config.in | 4 ++--
> package/qt5/qt5quick1/Config.in | 4 ++--
> package/qt5/qt5quickcontrols/Config.in | 4 ++--
> 6 files changed, 18 insertions(+), 18 deletions(-)
All three patches applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-30 23:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-30 9:34 [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 2/3] qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE Fatih Aşıcı
2013-12-30 9:34 ` [Buildroot] [PATCH 3/3] qt5webkit: " Fatih Aşıcı
2013-12-30 23:10 ` [Buildroot] [PATCH 1/3] qt5: use a common option for JavaScriptCore dependencies Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.