Skip to contentSkip to conversation

qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option

PATCH Superseded Thomas Petazzoni 4 participants 6 messages Nov 2, 2013 – Nov 4, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option

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

---
 package/qt/Config.in | 6 ------
 package/qt/qt.mk     | 6 ------
 2 files changed, 12 deletions(-)
package/qt/Config.in +0 -6
index 8801308..74b9461 100644
@@ -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
package/qt/qt.mk +0 -6
index 48d39fc..82ce51d 100644
@@ -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
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 2/2 qt: don't allow building WebKit on some architectures

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.

---
 package/qt/Config.in | 9 +++++++++
 1 file changed, 9 insertions(+)
package/qt/Config.in +9 -0
index 74b9461..b1a2207 100644
@@ -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"
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/2 qt: don't allow building WebKit on some architectures

Thomas, All,

On 2013-11-02 17:17 +0100, Thomas Petazzoni spake thusly:

Quoted 6 lines

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.

Quoted 42 lines
---
 package/qt/Config.in | 9 +++++++++
 1 file changed, 9 insertions(+)
package/qt/Config.in +9 -0
index 74b9461..b1a2207 100644
@@ -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"
Signature · 6 lines
1.8.1.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 2/2 qt: don't allow building WebKit on some architectures

In reply to Thomas Petazzoni
Quoted 6 lines · Thomas Petazzoni

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.

Quoted 9 lines
---
  package/qt/Config.in | 9 +++++++++
  1 file changed, 9 insertions(+)
package/qt/Config.in +0 -0
index 74b9461..b1a2207 100644

package/qt/Config.in config BR2_PACKAGE_QT_NETWORK · line 352

Quoted 9 lines
package/qt/Config.in +6 -0
@@ -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

Quoted 18 lines
package/qt/Config.in +3 -0
+
  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"
Signature · 6 lines
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
#4 lore raw

PATCH 2/2 qt: don't allow building WebKit on some architectures

In reply to Thomas Petazzoni
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> 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.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option

In reply to Thomas Petazzoni

Thomas, All,

On 2013-11-02 17:17 +0100, Thomas Petazzoni spake thusly:

Quoted 11 lines

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.

Quoted 5 lines

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.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'