summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2019-04-11 17:48:39 +0000
committerleot <leot@pkgsrc.org>2019-04-11 17:48:39 +0000
commitfce0937179c7432171b815d2604167e435e48367 (patch)
tree0ff840276b804391843f3630dee9e56951e368ce /www
parentb6116144157d6504913deaf24280ad076623bcf6 (diff)
downloadpkgsrc-fce0937179c7432171b815d2604167e435e48367.tar.gz
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.)
Diffstat (limited to 'www')
-rw-r--r--www/webkit-gtk/options.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk
index f9bbc06cdf7..edabc35351d 100644
--- a/www/webkit-gtk/options.mk
+++ b/www/webkit-gtk/options.mk
@@ -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