* [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option
@ 2013-11-02 16:17 Thomas Petazzoni
2013-11-02 16:17 ` [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures Thomas Petazzoni
2013-11-02 17:45 ` [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option Yann E. MORIN
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-11-02 16:17 UTC (permalink / raw)
To: buildroot
The BR2_PACKAGE_QT_JAVASCRIPTCORE option was incorrectly used in
Buildroot: it's help text and name was pretending it's here to
enable/disable the JavaScriptCore, but what it did in fact is force
enable or force disable the usage of the JIT mechanism for the
JavaScript support in Qt.
However, the JIT mechanism is architecture-specific, and therefore not
available for all architectures, and Qt already knows on which
architectures it is appropriate to enable JIT and on which
architectures it is not.
Therefore, this commit simply removes the
BR2_PACKAGE_QT_JAVASCRIPTCORE option. We don't add it to
Config.in.legacy, because the feature is still available, it's just
that Qt will know automatically decide whether JIT should be used or
not.
Fixes:
http://autobuild.buildroot.org/results/aae/aaeb82753b7654eeca679ded5d0211ceebda3ea2/build-end.log
http://autobuild.buildroot.org/results/367/3670e4f03ff0ce114c90bd7139243d82c427b52a/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt/Config.in | 6 ------
package/qt/qt.mk | 6 ------
2 files changed, 12 deletions(-)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 8801308..74b9461 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -356,12 +356,6 @@ config BR2_PACKAGE_QT_WEBKIT
comment "WebKit needs shared library/gui/network support"
depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
-config BR2_PACKAGE_QT_JAVASCRIPTCORE
- bool "JavaScriptCore JIT compiler"
- help
- Build the JavaScriptCore JIT compiler
- If unsure, say y
-
config BR2_PACKAGE_QT_STL
bool "STL support"
help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 48d39fc..82ce51d 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -415,12 +415,6 @@ else
QT_CONFIGURE_OPTS += -no-scripttools
endif
-ifeq ($(BR2_PACKAGE_QT_JAVASCRIPTCORE),y)
-QT_CONFIGURE_OPTS += -javascript-jit
-else
-QT_CONFIGURE_OPTS += -no-javascript-jit
-endif
-
ifeq ($(BR2_PACKAGE_QT_STL),y)
QT_CONFIGURE_OPTS += -stl
else
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures
2013-11-02 16:17 [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option Thomas Petazzoni
@ 2013-11-02 16:17 ` Thomas Petazzoni
2013-11-02 18:02 ` Yann E. MORIN
` (2 more replies)
2013-11-02 17:45 ` [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option Yann E. MORIN
1 sibling, 3 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-11-02 16:17 UTC (permalink / raw)
To: buildroot
WebKit has some architecture specific support, and therefore is not
necessarily available for all architectures. Make sure the Qt WebKit
option cannot be selected on those architectures that are not
supported.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt/Config.in | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 74b9461..b1a2207 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -344,17 +344,26 @@ config BR2_PACKAGE_QT_NETWORK
Install the Network module.
if unsure, say y
+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_powerpc || BR2_sh4 || BR2_sh4eb || \
+ BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
+
config BR2_PACKAGE_QT_WEBKIT
bool "WebKit Module"
depends on BR2_PACKAGE_QT_SHARED
depends on BR2_PACKAGE_QT_GUI_MODULE
depends on BR2_PACKAGE_QT_NETWORK
+ depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
help
Build the WebKit module.
If unsure, say n.
comment "WebKit needs shared library/gui/network support"
depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
+ depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
config BR2_PACKAGE_QT_STL
bool "STL support"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures
2013-11-02 16:17 ` [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures Thomas Petazzoni
@ 2013-11-02 18:02 ` Yann E. MORIN
2013-11-04 6:50 ` Arnout Vandecappelle
2013-11-04 23:00 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2013-11-02 18:02 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-11-02 17:17 +0100, Thomas Petazzoni spake thusly:
> WebKit has some architecture specific support, and therefore is not
> necessarily available for all architectures. Make sure the Qt WebKit
> option cannot be selected on those architectures that are not
> supported.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewd-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/qt/Config.in | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/package/qt/Config.in b/package/qt/Config.in
> index 74b9461..b1a2207 100644
> --- a/package/qt/Config.in
> +++ b/package/qt/Config.in
> @@ -344,17 +344,26 @@ config BR2_PACKAGE_QT_NETWORK
> Install the Network module.
> if unsure, say y
>
> +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_powerpc || BR2_sh4 || BR2_sh4eb || \
> + BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
> +
> config BR2_PACKAGE_QT_WEBKIT
> bool "WebKit Module"
> depends on BR2_PACKAGE_QT_SHARED
> depends on BR2_PACKAGE_QT_GUI_MODULE
> depends on BR2_PACKAGE_QT_NETWORK
> + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
> help
> Build the WebKit module.
> If unsure, say n.
>
> comment "WebKit needs shared library/gui/network support"
> depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
> + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
>
> config BR2_PACKAGE_QT_STL
> bool "STL support"
> --
> 1.8.1.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures
2013-11-02 16:17 ` [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures Thomas Petazzoni
2013-11-02 18:02 ` Yann E. MORIN
@ 2013-11-04 6:50 ` Arnout Vandecappelle
2013-11-04 23:00 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2013-11-04 6:50 UTC (permalink / raw)
To: buildroot
On 02/11/13 17:17, Thomas Petazzoni wrote:
> WebKit has some architecture specific support, and therefore is not
> necessarily available for all architectures. Make sure the Qt WebKit
> option cannot be selected on those architectures that are not
> supported.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/qt/Config.in | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/package/qt/Config.in b/package/qt/Config.in
> index 74b9461..b1a2207 100644
> --- a/package/qt/Config.in
> +++ b/package/qt/Config.in
> @@ -344,17 +344,26 @@ config BR2_PACKAGE_QT_NETWORK
> Install the Network module.
> if unsure, say y
>
> +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_powerpc || BR2_sh4 || BR2_sh4eb || \
> + BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
I like this pattern!
Regards,
Arnout
> +
> config BR2_PACKAGE_QT_WEBKIT
> bool "WebKit Module"
> depends on BR2_PACKAGE_QT_SHARED
> depends on BR2_PACKAGE_QT_GUI_MODULE
> depends on BR2_PACKAGE_QT_NETWORK
> + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
> help
> Build the WebKit module.
> If unsure, say n.
>
> comment "WebKit needs shared library/gui/network support"
> depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
> + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
>
> config BR2_PACKAGE_QT_STL
> bool "STL support"
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures
2013-11-02 16:17 ` [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures Thomas Petazzoni
2013-11-02 18:02 ` Yann E. MORIN
2013-11-04 6:50 ` Arnout Vandecappelle
@ 2013-11-04 23:00 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2013-11-04 23:00 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> WebKit has some architecture specific support, and therefore is not
> necessarily available for all architectures. Make sure the Qt WebKit
> option cannot be selected on those architectures that are not
> supported.
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option
2013-11-02 16:17 [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option Thomas Petazzoni
2013-11-02 16:17 ` [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures Thomas Petazzoni
@ 2013-11-02 17:45 ` Yann E. MORIN
1 sibling, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2013-11-02 17:45 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-11-02 17:17 +0100, Thomas Petazzoni spake thusly:
> The BR2_PACKAGE_QT_JAVASCRIPTCORE option was incorrectly used in
> Buildroot: it's help text and name was pretending it's here to
> enable/disable the JavaScriptCore, but what it did in fact is force
> enable or force disable the usage of the JIT mechanism for the
> JavaScript support in Qt.
>
> However, the JIT mechanism is architecture-specific, and therefore not
> available for all architectures, and Qt already knows on which
> architectures it is appropriate to enable JIT and on which
> architectures it is not.
>
> Therefore, this commit simply removes the
> BR2_PACKAGE_QT_JAVASCRIPTCORE option. We don't add it to
> Config.in.legacy, because the feature is still available, it's just
> that Qt will know automatically decide whether JIT should be used or
> not.
In fact, I think we should include it in legacy options, just so the
user is informed that this option is no longer available.
Your little blurb above would make a good help entry for that new legacy
option, BTW.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-04 23:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-02 16:17 [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option Thomas Petazzoni
2013-11-02 16:17 ` [Buildroot] [PATCH 2/2] qt: don't allow building WebKit on some architectures Thomas Petazzoni
2013-11-02 18:02 ` Yann E. MORIN
2013-11-04 6:50 ` Arnout Vandecappelle
2013-11-04 23:00 ` Peter Korsgaard
2013-11-02 17:45 ` [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox