qt5: use a common option for JavaScriptCore dependencies
PATCH 1/3 qt5: use a common option for JavaScriptCore dependencies
This will be used by other qt packages that contain a copy of JavaScriptCore.
Signed-off-by Fatih A??c? <[email protected]>
--- 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(-)
package/qt5/Config.in +8 -0
@@ -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
package/qt5/qt5declarative/Config.in +2 -10
@@ -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
package/qt5/qt5graphicaleffects/Config.in +2 -2
@@ -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
package/qt5/qt5multimedia/Config.in +2 -2
@@ -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
package/qt5/qt5quick1/Config.in +2 -2
@@ -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
package/qt5/qt5quickcontrols/Config.in +2 -2
@@ -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
Signature · 1 line
1.8.5.1
PATCH 2/3 qt5script: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
Signed-off-by Fatih A??c? <[email protected]>
--- package/qt5/qt5script/Config.in | 1 + 1 file changed, 1 insertion(+)
package/qt5/qt5script/Config.in +1 -0
@@ -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++.
Signature · 1 line
1.8.5.1
PATCH 3/3 qt5webkit: depend on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
In reply to Fatih AşıcıSigned-off-by Fatih A??c? <[email protected]>
--- package/qt5/qt5webkit/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
package/qt5/qt5webkit/Config.in +1 -2
@@ -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++.
Signature · 1 line
1.8.5.1
PATCH 1/3 qt5: use a common option for JavaScriptCore dependencies
In reply to Fatih AşıcıDear Fatih A??c?,
Quoted 4 lines · Fatih A??c?
This will be used by other qt packages that contain a copy of JavaScriptCore.
Signed-off-by Fatih A??c? <[email protected]>
Quoted 8 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com