فهرست منبع

qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option

The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to force the
activation or disabling of the JIT compiler in the Qt Javascript
interpreter. However, the JIT compiler is not available for all
architectures, so forcing its activation does not always
work. Moreover, Qt knows by itself for which architectures JIT support
is possible, and will automatically enable it if possible.

Therefore, this option was in fact useless, and causing build problems
when enabled on architectures for which the JIT support was not
available. This commit removes this option and there is no
replacement: Qt will enable JIT at compile time when possible.

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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 11 سال پیش
والد
کامیت
1f9c04f618
3فایلهای تغییر یافته به همراه18 افزوده شده و 12 حذف شده
  1. 18 0
      Config.in.legacy
  2. 0 6
      package/qt/Config.in
  3. 0 6
      package/qt/qt.mk

+ 18 - 0
Config.in.legacy

@@ -101,6 +101,24 @@ endif
 ###############################################################################
 ###############################################################################
 comment "Legacy options removed in 2013.11"
 comment "Legacy options removed in 2013.11"
 
 
+config BR2_PACKAGE_QT_JAVASCRIPTCORE
+	bool "qt javascriptcore option removed"
+	select BR2_LEGACY
+	help
+	  The BR2_PACKAGE_QT_JAVASCRIPTCORE option was available to
+	  force the activation or disabling of the JIT compiler in the
+	  Qt Javascript interpreter. However, the JIT compiler is not
+	  available for all architectures, so forcing its activation
+	  does not always work. Moreover, Qt knows by itself for which
+	  architectures JIT support is possible, and will
+	  automatically enable it if possible.
+
+	  Therefore, this option was in fact useless, and causing
+	  build problems when enabled on architectures for which the
+	  JIT support was not available. It has been removed, and
+	  there is no replacement: Qt will enable JIT at compile time
+	  when possible.
+
 config BR2_PACKAGE_MODULE_INIT_TOOLS
 config BR2_PACKAGE_MODULE_INIT_TOOLS
 	bool "module-init-tools replaced by kmod"
 	bool "module-init-tools replaced by kmod"
 	select BR2_PACKAGE_KMOD
 	select BR2_PACKAGE_KMOD

+ 0 - 6
package/qt/Config.in

@@ -365,12 +365,6 @@ 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_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
 	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 
 
-config BR2_PACKAGE_QT_JAVASCRIPTCORE
-	bool "JavaScriptCore JIT compiler"
-	help
-	  Build the JavaScriptCore JIT compiler
-	  If unsure, say y
-
 config BR2_PACKAGE_QT_STL
 config BR2_PACKAGE_QT_STL
 	bool "STL support"
 	bool "STL support"
 	help
 	help

+ 0 - 6
package/qt/qt.mk

@@ -415,12 +415,6 @@ else
 QT_CONFIGURE_OPTS += -no-scripttools
 QT_CONFIGURE_OPTS += -no-scripttools
 endif
 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)
 ifeq ($(BR2_PACKAGE_QT_STL),y)
 QT_CONFIGURE_OPTS += -stl
 QT_CONFIGURE_OPTS += -stl
 else
 else