pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

webkit-gtk: Improve handling of `webkit-jit' option



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Oct 6 23:30:06 2018 +0200
Changeset:	0d885b792af0631462aa17a576f580061f683326

Modified Files:
	webkit-gtk/TODO
	webkit-gtk/options.mk

Log Message:
webkit-gtk: Improve handling of `webkit-jit' option

- Remove the `XXX' comment about JIT that produces invalid code: it was added
  referring to SunOS-* and unfortunately at the moment there is no JIT support
  for SunOS-es.
- Add a WEBKIT_JIT_MACHINE_PLATFORMS list to include all MACHINE_PLATFORMs that
  has support for the JIT and add the `webkit-jit' to suggested option only for
  them.
- Remove `webkit-jit' option TODO entries now that are done

Please note that this alter the webkit-jit suggested option on your
MACHINE_PLATFORM but should reflect the current real support of it.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0d885b792af0631462aa17a576f580061f683326

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/TODO       |  2 --
 webkit-gtk/options.mk | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diffs:
diff --git a/webkit-gtk/TODO b/webkit-gtk/TODO
index 190862b093..ca13491474 100644
--- a/webkit-gtk/TODO
+++ b/webkit-gtk/TODO
@@ -3,8 +3,6 @@
    * patches/patch-Source_WTF_wtf_Platform.h
   Only amd64 was actually tested and arm, arm64 and mips really need a
   double-check.
-- Enable webkit-jit option
-- Sync options.mk `webkit-jit' option with platforms that has JIT support
 - Could the NetBSD logic in
   patches/patch-Source_JavaScriptCore_runtime_MachineContext.h be rewritten
   using ucontext(2) _UC_MACHINE_* macros instead?
diff --git a/webkit-gtk/options.mk b/webkit-gtk/options.mk
index fec33bddeb..094122cf34 100644
--- a/webkit-gtk/options.mk
+++ b/webkit-gtk/options.mk
@@ -9,14 +9,19 @@ PLIST_VARS=	introspection
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX JIT produces invalid code
-# it's also entirely unsupported on powerpc and sparc
-.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-sparc) \
- && empty(MACHINE_PLATFORM:MSunOS-*)
+#
+# Platforms that support the webkit-jit option
+#
+WEBKIT_JIT_MACHINE_PLATFORMS+=	Darwin-*-*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	DragonFly-*-*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	FreeBSD-*-x86_64 FreeBSD-*-i386 FreeBSD-*-arm*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	FreeBSD-*-aarch64 FreeBSD-*-mips*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	Linux-*-x86_64 Linux-*-i386 Linux-*-arm*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	Linux-*-aarch64 Linux-*-mips*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	NetBSD-*-x86_64 NetBSD-*-i386 NetBSD-*-arm*
+WEBKIT_JIT_MACHINE_PLATFORMS+=	NetBSD-*-aarch64 NetBSD-*-mips*
+
+.if !empty(WEBKIT_JIT_MACHINE_PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
 PKG_SUGGESTED_OPTIONS+=	webkit-jit
 .endif
 


Home | Main Index | Thread Index | Old Index