From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 07:39:56 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68E0B106567C for ; Tue, 2 Oct 2012 07:39:56 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 09E7B8FC08 for ; Tue, 2 Oct 2012 07:39:55 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q927dtWp000737 for ; Tue, 2 Oct 2012 07:39:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q927doL6099383 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 07:39:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 07:39:50 GMT Message-Id: <201210020739.q927doL6099383@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1052 - in trunk: Mk mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2012 07:39:56 -0000 Author: jbeich Date: Tue Oct 2 07:39:49 2012 New Revision: 1052 Log: jemalloc doesn't work on 7.x, disable Reported by: flo Deleted: trunk/mail/thunderbird/files/patch-mozilla-configure.in trunk/www/firefox-nightly/files/patch-configure.in trunk/www/firefox/files/patch-configure.in trunk/www/seamonkey/files/patch-mozilla-configure.in Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Oct 2 07:39:39 2012 (r1051) +++ trunk/Mk/bsd.gecko.mk Tue Oct 2 07:39:49 2012 (r1052) @@ -551,6 +551,17 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} .endif +.if ${OSVERSION} > 1000011 +# use jemalloc 3.0.0 API in libc +MOZ_EXPORT+= MOZ_JEMALLOC=1 +.elif ${OSVERSION} > 800004 +MOZ_OPTIONS+= --enable-jemalloc +MOZ_EXPORT+= MOZ_JEMALLOC=1 +.elif ${OSVERSION} > 700101 +# has _pthread_mutex_init_calloc_cb but firefox crashes when jemalloc +# configured without --enable-debug +.endif + # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip Deleted: trunk/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then Deleted: trunk/www/firefox-nightly/files/patch-configure.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then Deleted: trunk/www/firefox/files/patch-configure.in ============================================================================== --- trunk/www/firefox/files/patch-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then Deleted: trunk/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-configure.in Tue Oct 2 07:39:49 2012 (r1051) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -6925,6 +6925,13 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, - MOZ_MEMORY=1, - MOZ_MEMORY=) - -+MOZ_JEMALLOC=1 -+MOZ_NATIVE_JEMALLOC=1 -+AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ MOZ_MEMORY=1 -+ break]) -+ - if test "$NS_TRACE_MALLOC"; then - MOZ_MEMORY= - fi -@@ -6961,18 +6968,12 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -- if test -n "$MOZ_JEMALLOC"; then -- MOZ_NATIVE_JEMALLOC=1 -- AC_CHECK_FUNCS(mallctl nallocm,, -- [MOZ_NATIVE_JEMALLOC= -- break]) - if test -n "$MOZ_NATIVE_JEMALLOC"; then - MOZ_MEMORY=1 - AC_DEFINE(MOZ_MEMORY) - AC_DEFINE(MOZ_JEMALLOC) - AC_DEFINE(MOZ_NATIVE_JEMALLOC) - fi -- fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then