aboutsummaryrefslogtreecommitdiffstats
path: root/Mk/bsd.gecko.mk
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2015-08-20 21:16:12 +0800
committerjbeich <jbeich@FreeBSD.org>2015-08-20 21:16:12 +0800
commit1b62a237991347164fbf3a7e56eb772955edfc77 (patch)
tree16b15ab067f8e87a4b4e048d23f8761c97d74208 /Mk/bsd.gecko.mk
parent318f1831f289565873c0a29cc58be54334dd2056 (diff)
downloadfreebsd-ports-gnome-1b62a237991347164fbf3a7e56eb772955edfc77.tar.gz
freebsd-ports-gnome-1b62a237991347164fbf3a7e56eb772955edfc77.tar.zst
freebsd-ports-gnome-1b62a237991347164fbf3a7e56eb772955edfc77.zip
gecko: use system jemalloc on 11.0-CURRENT again
Requested by: mi
Diffstat (limited to 'Mk/bsd.gecko.mk')
-rw-r--r--Mk/bsd.gecko.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 5c4679510b19..5286cd285d34 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -130,7 +130,12 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA}
# use jemalloc 3.0.0 API for stats/tuning
MOZ_EXPORT+= MOZ_JEMALLOC3=1
-.if ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
+.if ${OSVERSION} >= 1100079
+. if ${MOZILLA_VER:R:R} < 43
+# system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bug1125514
+. endif
+.elif ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
MOZ_OPTIONS+= --enable-jemalloc
.endif