Wed Dec 17 18:27:53 2008 UTC ()
Be more explicit wrt the mozilla-jemalloc PKG_OPTION.
It turns out that if neither --enable-jemalloc or --disable-jemalloc
is given, the outcome depends on what platform we're on.
If you were on NetBSD and had the mozilla-jemalloc option enabled
you weren't actually building with the mozilla jemalloc replacement.
I've now enabled the mozilla-jemalloc option by default only
on Linux and Solaris, where we know it's needed.
This is part of PR pkg/39085.

XXX need to research whether mozilla-jemalloc has any advantage on NetBSD.


(tnn)
diff -r1.13 -r1.14 pkgsrc/www/seamonkey/options.mk
cvs diff -r1.13 -r1.14 pkgsrc/www/seamonkey/options.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/options.mk 2008/09/18 21:14:59 1.13
+++ pkgsrc/www/seamonkey/options.mk 2008/12/17 18:27:53 1.14
@@ -1,46 +1,50 @@ @@ -1,46 +1,50 @@
1# $NetBSD: options.mk,v 1.13 2008/09/18 21:14:59 adrianp Exp $ 1# $NetBSD: options.mk,v 1.14 2008/12/17 18:27:53 tnn Exp $
2# used by www/firefox/Makefile.common 2# used by www/firefox/Makefile.common
3# used by www/firefox3/Makefile.common 3# used by www/firefox3/Makefile.common
4# used by www/seamonkey/Makefile.common 4# used by www/seamonkey/Makefile.common
5 5
6PKG_OPTIONS_VAR= PKG_OPTIONS.gecko 6PKG_OPTIONS_VAR= PKG_OPTIONS.gecko
7PKG_SUPPORTED_OPTIONS= debug official-mozilla-branding 7PKG_SUPPORTED_OPTIONS= debug official-mozilla-branding
8 8
9.if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "seamonkey-bin" || ${MOZILLA_BIN} == "thunderbird-bin" ) 9.if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "seamonkey-bin" || ${MOZILLA_BIN} == "thunderbird-bin" )
10PKG_SUPPORTED_OPTIONS += mozilla-single-profile 10PKG_SUPPORTED_OPTIONS += mozilla-single-profile
11.endif 11.endif
12 12
13.if ( ${MOZILLA} == "firefox3" ) 13.if ( ${MOZILLA} == "firefox3" )
14PKG_SUPPORTED_OPTIONS += mozilla-jemalloc 14PKG_SUPPORTED_OPTIONS += mozilla-jemalloc
 15. if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
15PKG_SUGGESTED_OPTIONS += mozilla-jemalloc 16PKG_SUGGESTED_OPTIONS += mozilla-jemalloc
 17. endif
16.endif 18.endif
17 19
18.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
19 21
20# including jemalloc can cause issues on some platforms (e.g. SunOS 5.11) 22# including jemalloc can cause issues on some platforms (e.g. SunOS 5.11)
21# so expose an option to allow users to build FF without it. 23# so expose an option to allow users to build FF without it.
22# NOTE: This currently has only been known to happen on SunOS 5.11 x86 24# NOTE: This currently has only been known to happen on SunOS 5.11 x86
23# as a full list of systems is unknown the default is to still use it 25# as a full list of systems is unknown the default is to still use it
24.if empty(PKG_OPTIONS:Mmozilla-jemalloc) 26.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 27CONFIGURE_ARGS+= --enable-jemalloc
 28.else
25CONFIGURE_ARGS+= --disable-jemalloc 29CONFIGURE_ARGS+= --disable-jemalloc
26.endif 30.endif
27 31
28# this .if test looks backward, but the missing options disables debug, 32# this .if test looks backward, but the missing options disables debug,
29# so it is correct 33# so it is correct
30.if empty(PKG_OPTIONS:Mdebug) 34.if !empty(PKG_OPTIONS:Mdebug)
31CONFIGURE_ARGS+= --disable-debug 
32.else 
33CONFIGURE_ARGS+= --enable-debug 35CONFIGURE_ARGS+= --enable-debug
 36.else
 37CONFIGURE_ARGS+= --disable-debug
34.endif 38.endif
35 39
36.if !empty(PKG_OPTIONS:Mmozilla-single-profile) 40.if !empty(PKG_OPTIONS:Mmozilla-single-profile)
37CONFIGURE_ARGS+= --enable-single-profile 41CONFIGURE_ARGS+= --enable-single-profile
38.endif 42.endif
39 43
40# Enable Official mozilla.org Branding for Firefox or Thunderbird. 44# Enable Official mozilla.org Branding for Firefox or Thunderbird.
41# Note that you cannot distribute builds with Official Branding 45# Note that you cannot distribute builds with Official Branding
42# without permission of the Mozilla Foundation. 46# without permission of the Mozilla Foundation.
43# See http://www.mozilla.org/foundation/trademarks/ 47# See http://www.mozilla.org/foundation/trademarks/
44.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) && ${MOZILLA_BIN} != "seamonkey-bin" 48.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) && ${MOZILLA_BIN} != "seamonkey-bin"
45CONFIGURE_ARGS+= --enable-official-branding 49CONFIGURE_ARGS+= --enable-official-branding
46# Mozilla prohibits distribution of packages with their trademarks. 50# Mozilla prohibits distribution of packages with their trademarks.