From owner-svn-ports-all@freebsd.org  Thu Jun 22 01:19:29 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFE3CD9D597;
 Thu, 22 Jun 2017 01:19:29 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 83A2699D;
 Thu, 22 Jun 2017 01:19:29 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5M1JSl3036851;
 Thu, 22 Jun 2017 01:19:28 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5M1JSoA036850;
 Thu, 22 Jun 2017 01:19:28 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201706220119.v5M1JSoA036850@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 22 Jun 2017 01:19:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r444091 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2017 01:19:29 -0000

Author: jbeich
Date: Thu Jun 22 01:19:28 2017
New Revision: 444091
URL: https://svnweb.freebsd.org/changeset/ports/444091

Log:
  gecko: phase out system jemalloc via 12.0-CURRENT as well
  
  https://bugzilla.mozilla.org/show_bug.cgi?id=1363992
  
  PR:		220027

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Thu Jun 22 01:19:16 2017	(r444090)
+++ head/Mk/bsd.gecko.mk	Thu Jun 22 01:19:28 2017	(r444091)
@@ -139,18 +139,10 @@ MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}"
 
 LDFLAGS+=		-Wl,--as-needed
 
-.if ${MOZILLA_VER:R:R} < 55
-.if ${OPSYS} != DragonFly # XXX xpcshell crash during install
+.if ${MOZILLA_VER:R:R} < 55 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1200032
 # use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning
-MOZ_EXPORT+=	MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1
-.if ${OPSYS} != FreeBSD || ${MOZILLA_VER:R:R} >= 37
-. if ${MOZILLA_VER:R:R} >= 48
+MOZ_EXPORT+=	MOZ_JEMALLOC4=1
 MOZ_OPTIONS+=	--enable-jemalloc=4
-.else
-MOZ_OPTIONS+=	--enable-jemalloc
-. endif
-.endif
-.endif # !DragonFly
 .endif # Mozilla < 55
 
 # Standard depends