From d91ecf63d8c6aa41341db3303931f67185aff020 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Mon, 12 Apr 2010 02:26:39 +0000
Subject: Introduce webkit-jit option, enabled by default (no changes).

Disabling jit will avoid startup crash of www/midori and www/epiphany,
on NetBSD-5, reported as PR#42687 and PR#43039.
---
 www/webkit-gtk/Makefile   |  3 ++-
 www/webkit-gtk/options.mk | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 www/webkit-gtk/options.mk

(limited to 'www')

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index a26f4b8b026..fcc63db098b 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/04/12 02:26:39 obache Exp $
 
 DISTNAME=	webkit-1.1.15.4
 PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
@@ -23,6 +23,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-target=x11 \
 			--with-font-backend=freetype
+.include "options.mk"
 
 REPLACE_PERL+=	JavaScriptCore/pcre/dftables \
 		JavaScriptCore/create_hash_table \
diff --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk
new file mode 100644
index 00000000000..b1d5e54f8bb
--- /dev/null
+++ b/www/webkit-gtk/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2010/04/12 02:26:39 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.webkit-gtk
+PKG_SUPPORTED_OPTIONS=	webkit-jit
+PKG_SUGGESTED_OPTIONS=	webkit-jit
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mwebkit-jit)
+CONFIGURE_ARGS+=	--enable-jit
+.else
+CONFIGURE_ARGS+=	--disable-jit
+.endif
-- 
cgit v1.2.3