From 88c83a21f0f4d4c20d84a51edc78b5e763968ad8 Mon Sep 17 00:00:00 2001 From: flo Date: Fri, 12 Oct 2012 09:08:22 +0000 Subject: - update {thunderbird,firefox}-esr* and libxul to 10.0.9 - use bundled jemalloc since 7.2 [1] - avoid thread-local variables before 8.3, 9.1, 10.0, to avoid crashes [2] - bump PORTREVISION on mail/thunderbird and www/firefox for the TLS fixes Security: 6e5a9afd-12d3-11e2-b47d-c8600054b392 Reported by: angelv , Hanno Krusken [2] Reference: http://svnweb.freebsd.org/changeset/base/225582 [2] Submitted by: Jan Beich [1], [2] Feature safe: yes --- Mk/bsd.gecko.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Mk/bsd.gecko.mk') diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index c7763c4e1bb2..d7febeb00386 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -555,15 +555,18 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} .if ${OSVERSION} > 1000011 # use jemalloc 3.0.0 API in libc MOZ_EXPORT+= MOZ_JEMALLOC=1 -.elif ${OSVERSION} > 800004 +.elif ${OSVERSION} > 701106 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 .endif +.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900045) \ + || ${OSVERSION} < 802513 +MOZ_EXPORT+= ac_cv_thread_keyword=no \ + je_cv_tls_model=no +.endif + # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip -- cgit