CVS commit: pkgsrc/www/webkit-gtk

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Thu Apr 11 17:48:39 UTC 2019

Modified Files:
        pkgsrc/www/webkit-gtk: options.mk

Log Message:
webkit-gtk: Adjust WEBKIT_JIT_MACHINE_PLATFORMS per-upstream

Sync WEBKIT_JIT_MACHINE_PLATFORMS (platforms where `webkit-jit'
option is suggested) is enabled by default with
Source/cmake/WebKitFeatures.cmake.

While here also disable ENABLE_C_LOOP when ENABLE_JIT is enabled
(the two options are incompatible).

Should workaround PR pkg/54109.

(No PKGREVISION bump since it should only fix platforms where since
update of webkit-gtk 2.24.0 were broken.)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/webkit-gtk/options.mk

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

Modified files:

Index: pkgsrc/www/webkit-gtk/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.15 pkgsrc/www/webkit-gtk/options.mk:1.16
--- pkgsrc/www/webkit-gtk/options.mk:1.15       Tue Apr  9 15:34:04 2019
+++ pkgsrc/www/webkit-gtk/options.mk    Thu Apr 11 17:48:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/04/09 15:34:04 leot Exp $
+# $NetBSD: options.mk,v 1.16 2019/04/11 17:48:39 leot Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
@@ -18,12 +18,10 @@ PLIST_VARS= introspection
 #
 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+= FreeBSD-*-x86_64 FreeBSD-*-aarch64
+WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-x86_64 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*
+WEBKIT_JIT_MACHINE_PLATFORMS+= NetBSD-*-x86_64 NetBSD-*-aarch64
 
 .if !empty(WEBKIT_JIT_MACHINE_PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
 PKG_SUGGESTED_OPTIONS+=        webkit-jit
@@ -36,6 +34,7 @@ PKG_SUGGESTED_OPTIONS+=       webkit-jit
 #
 .if !empty(PKG_OPTIONS:Mwebkit-jit)
 CMAKE_ARGS+=   -DENABLE_JIT=ON
+CMAKE_ARGS+=   -DENABLE_C_LOOP=OFF
 .else
 CMAKE_ARGS+=   -DENABLE_JIT=OFF
 .endif