Tue Mar 31 15:55:44 2015 UTC ()
Disable optimisations only when compiling for debugging.


(joerg)
diff -r1.39 -r1.40 pkgsrc/www/webkit-gtk/Makefile.common
diff -r1.7 -r1.8 pkgsrc/www/webkit-gtk/options.mk
cvs diff -r1.39 -r1.40 pkgsrc/www/webkit-gtk/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Attic/Makefile.common 2015/01/18 18:52:01 1.39
+++ pkgsrc/www/webkit-gtk/Attic/Makefile.common 2015/03/31 15:55:44 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.39 2015/01/18 18:52:01 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.40 2015/03/31 15:55:44 joerg Exp $
2# used by www/webkit-gtk/Makefile 2# used by www/webkit-gtk/Makefile
3 3
4DISTNAME= webkitgtk-2.4.8 4DISTNAME= webkitgtk-2.4.8
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.webkitgtk.org/releases/ 6MASTER_SITES= http://www.webkitgtk.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.webkitgtk.org/ 10HOMEPAGE= http://www.webkitgtk.org/
11 11
12DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo
13PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches 13PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches
14 14
@@ -16,27 +16,26 @@ USE_LANGUAGES= c c++ @@ -16,27 +16,26 @@ USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt 17USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt
18 18
19# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3 19# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3
20GCC_REQD+= 4.8 20GCC_REQD+= 4.8
21 21
22PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in 22PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in
23 23
24MAKE_FILE= GNUmakefile 24MAKE_FILE= GNUmakefile
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26 26
27CONFIGURE_ARGS+= --enable-x11-target \ 27CONFIGURE_ARGS+= --enable-x11-target \
28 --disable-geolocation \ 28 --disable-geolocation \
29 --disable-optimizations \ 
30 --disable-gtk-doc-html 29 --disable-gtk-doc-html
31 30
32.include "options.mk" 31.include "options.mk"
33 32
34REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \ 33REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
35 Source/WebCore/bindings/scripts/*.pl \ 34 Source/WebCore/bindings/scripts/*.pl \
36 Source/WebCore/bindings/scripts/InFilesCompiler.pm \ 35 Source/WebCore/bindings/scripts/InFilesCompiler.pm \
37 Source/WebCore/bindings/scripts/InFilesParser.pm \ 36 Source/WebCore/bindings/scripts/InFilesParser.pm \
38 Source/WebCore/css/*.pl \ 37 Source/WebCore/css/*.pl \
39 Source/WebCore/dom/*.pl \ 38 Source/WebCore/dom/*.pl \
40 Source/WebCore/make-hash-tools.pl \ 39 Source/WebCore/make-hash-tools.pl \
41 Source/WebCore/platform/text/mac/*.pl 40 Source/WebCore/platform/text/mac/*.pl
42 41
cvs diff -r1.7 -r1.8 pkgsrc/www/webkit-gtk/options.mk (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/options.mk 2014/09/17 17:35:23 1.7
+++ pkgsrc/www/webkit-gtk/options.mk 2015/03/31 15:55:44 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.7 2014/09/17 17:35:23 macallan Exp $ 1# $NetBSD: options.mk,v 1.8 2015/03/31 15:55:44 joerg Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk 4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
5PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit 5PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit
6PKG_SUGGESTED_OPTIONS= enchant opengl 6PKG_SUGGESTED_OPTIONS= enchant opengl
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10# XXX JIT produces invalid code 10# XXX JIT produces invalid code
11# it's also entirely unsupported on powerpc and sparc 11# it's also entirely unsupported on powerpc and sparc
12.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \ 12.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
13 && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \ 13 && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \
14 && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) \ 14 && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) \
@@ -23,29 +23,31 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit @@ -23,29 +23,31 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit
23# 23#
24# JIT support 24# JIT support
25# 25#
26.if !empty(PKG_OPTIONS:Mwebkit-jit) 26.if !empty(PKG_OPTIONS:Mwebkit-jit)
27CONFIGURE_ARGS+= --enable-jit 27CONFIGURE_ARGS+= --enable-jit
28.else 28.else
29CONFIGURE_ARGS+= --disable-jit 29CONFIGURE_ARGS+= --disable-jit
30.endif 30.endif
31 31
32# 32#
33# debug support 33# debug support
34# 34#
35.if !empty(PKG_OPTIONS:Mdebug) 35.if !empty(PKG_OPTIONS:Mdebug)
36CONFIGURE_ARGS+= --enable-debug 36CONFIGURE_ARGS+= --enable-debug \
 37 --disable-optimizations
37.else 38.else
38CONFIGURE_ARGS+= --disable-debug 39CONFIGURE_ARGS+= --disable-debug \
 40 --enable-optimizations
39.endif 41.endif
40 42
41# 43#
42# OpenGL support: enable support for GLX, WebGL and accelerated compositing 44# OpenGL support: enable support for GLX, WebGL and accelerated compositing
43# 45#
44# TODO: should we split them in multiple options? 46# TODO: should we split them in multiple options?
45# 47#
46.if !empty(PKG_OPTIONS:Mopengl) 48.if !empty(PKG_OPTIONS:Mopengl)
47CONFIGURE_ARGS+= --enable-glx 49CONFIGURE_ARGS+= --enable-glx
48CONFIGURE_ARGS+= --enable-webgl 50CONFIGURE_ARGS+= --enable-webgl
49CONFIGURE_ARGS+= --enable-accelerated-compositing 51CONFIGURE_ARGS+= --enable-accelerated-compositing
50.else 52.else
51CONFIGURE_ARGS+= --disable-glx 53CONFIGURE_ARGS+= --disable-glx