diff options
Diffstat (limited to 'www/firefox31/patches/patch-storage_src_moz.build')
| -rw-r--r-- | www/firefox31/patches/patch-storage_src_moz.build | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/www/firefox31/patches/patch-storage_src_moz.build b/www/firefox31/patches/patch-storage_src_moz.build new file mode 100644 index 00000000000..4b8da3c7094 --- /dev/null +++ b/www/firefox31/patches/patch-storage_src_moz.build @@ -0,0 +1,20 @@ +$NetBSD: patch-storage_src_moz.build,v 1.1 2014/11/03 12:18:32 ryoon Exp $ + +--- storage/src/moz.build.orig 2014-07-17 01:45:38.000000000 +0000 ++++ storage/src/moz.build +@@ -48,11 +48,14 @@ FINAL_LIBRARY = 'storagecomps' + # (such as NSS) might trigger an initialization of sqlite and allocation + # of memory using the default allocator, prior to the storage service + # registering its allocator, causing memory management failures (bug 938730). ++# However, this is not an issue if both the jemalloc allocator and the default ++# allocator are the same thing. + # + # Note: On Windows our sqlite build assumes we use jemalloc. If you disable + # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef + # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. +-if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']: ++if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE'] ++ or CONFIG['MOZ_NATIVE_JEMALLOC']): + if CONFIG['OS_TARGET'] != 'Android': + DEFINES['MOZ_STORAGE_MEMORY'] = True + |