Date: Tue, 2 Oct 2012 07:39:50 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1052 - in trunk: Mk mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files Message-ID: <201210020739.q927doL6099383@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210020739.q927doL6099383>