summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro <aperez@igalia.com>2018-10-10 01:08:49 +0300
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-10-10 21:21:46 +0200
commitcf9c80c1818e8b9860692719dd0aa3ca7c0fc817 (patch)
treeec3cb11e60c0cb7675ebbce17951288ef343e3c1
parentb67d9566d18f9abbf80987761f8a30f510cd36b2 (diff)
downloadbuildroot-cf9c80c1818e8b9860692719dd0aa3ca7c0fc817.tar.gz
buildroot-cf9c80c1818e8b9860692719dd0aa3ca7c0fc817.zip
webkitgtk: move JSC JIT selection logic to kconfig
This is done in preparation to enable the JavaScriptCore JIT support for more platforms. Having the logic in Config.in scales better than checking in the .mk file. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/webkitgtk/Config.in8
-rw-r--r--package/webkitgtk/webkitgtk.mk4
2 files changed, 9 insertions, 3 deletions
diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index 96a7ab0c94..6933248bd6 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -11,6 +11,14 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT
+ bool
+ # ARM needs NEON for JIT.
+ default y if BR2_ARM_CPU_HAS_NEON
+ # i386 & x86_64 don't have any special requirements.
+ default y if BR2_i386
+ default y if BR2_x86_64
+
comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8"
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index f28417ac73..39d681b1d4 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -27,9 +27,7 @@ WEBKITGTK_CONF_OPTS = \
-DUSE_LIBNOTIFY=OFF \
-DUSE_LIBHYPHEN=OFF
-# ARM needs NEON for JIT
-# i386 & x86_64 don't seem to have any special requirements
-ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_i386)$(BR2_x86_64),y)
+ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
else
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF
OpenPOWER on IntegriCloud