diff options
| author | tnn <tnn@pkgsrc.org> | 2008-12-17 18:27:53 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-12-17 18:27:53 +0000 |
| commit | 03ab7af62b81584b63df44cd0d413963d66cf88b (patch) | |
| tree | b6791d7a27334abf2d7de729174d911a21c65803 | |
| parent | 612a95e59e612383adc581a2a1ef7c9f36bdaa09 (diff) | |
| download | pkgsrc-03ab7af62b81584b63df44cd0d413963d66cf88b.tar.gz | |
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.
| -rw-r--r-- | www/seamonkey/options.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk index fda72726e1e..950626eb727 100644 --- a/www/seamonkey/options.mk +++ b/www/seamonkey/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2008/09/18 21:14:59 adrianp Exp $ +# $NetBSD: options.mk,v 1.14 2008/12/17 18:27:53 tnn Exp $ # used by www/firefox/Makefile.common # used by www/firefox3/Makefile.common # used by www/seamonkey/Makefile.common @@ -12,7 +12,9 @@ PKG_SUPPORTED_OPTIONS += mozilla-single-profile .if ( ${MOZILLA} == "firefox3" ) PKG_SUPPORTED_OPTIONS += mozilla-jemalloc +. if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" PKG_SUGGESTED_OPTIONS += mozilla-jemalloc +. endif .endif .include "../../mk/bsd.options.mk" @@ -21,16 +23,18 @@ PKG_SUGGESTED_OPTIONS += mozilla-jemalloc # so expose an option to allow users to build FF without it. # NOTE: This currently has only been known to happen on SunOS 5.11 x86 # as a full list of systems is unknown the default is to still use it -.if empty(PKG_OPTIONS:Mmozilla-jemalloc) +.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) +CONFIGURE_ARGS+= --enable-jemalloc +.else CONFIGURE_ARGS+= --disable-jemalloc .endif # this .if test looks backward, but the missing options disables debug, # so it is correct -.if empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --disable-debug -.else +.if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-debug +.else +CONFIGURE_ARGS+= --disable-debug .endif .if !empty(PKG_OPTIONS:Mmozilla-single-profile) |