From owner-freebsd-gecko@FreeBSD.ORG  Tue Oct  2 11:03:27 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
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 C5B08106564A
	for <freebsd-gecko@freebsd.org>; Tue,  2 Oct 2012 11:03:27 +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 501C78FC0C
	for <freebsd-gecko@freebsd.org>; Tue,  2 Oct 2012 11:03:26 +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 q92B3KIs082594
	for <freebsd-gecko@freebsd.org>; Tue, 2 Oct 2012 11:03:20 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q92B3Dh7082108
	for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 11:03:13 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 2 Oct 2012 11:03:13 GMT
Message-Id: <201210021103.q92B3Dh7082108@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] r1055 - trunk/Mk
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 <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2012 11:03:28 -0000

Author: jbeich
Date: Tue Oct  2 11:03:13 2012
New Revision: 1055

Log:
mozilla's fork of jemalloc doesn't work on FreeBSD, disable after r1052

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Tue Oct  2 08:44:11 2012	(r1054)
+++ trunk/Mk/bsd.gecko.mk	Tue Oct  2 11:03:13 2012	(r1055)
@@ -551,6 +551,7 @@
 LDFLAGS+=		-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 .endif
 
+.if ${MOZILLA_VER:R:R} >= 16 || exists(${.CURDIR}/files/patch-bug788955)
 .if ${OSVERSION} > 1000011
 # use jemalloc 3.0.0 API in libc
 MOZ_EXPORT+=	MOZ_JEMALLOC=1
@@ -561,6 +562,7 @@
 # has _pthread_mutex_init_calloc_cb but firefox crashes when jemalloc
 # configured without --enable-debug
 .endif
+.endif
 
 # Standard depends
 _ALL_DEPENDS=	cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip