aboutsummaryrefslogtreecommitdiffstats
path: root/main/xulrunner/uclibc-malloc_usable_size.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-04-17 12:59:44 +0000
committerTimo Teräs <timo.teras@iki.fi>2014-04-17 13:02:43 +0000
commit4a300b5cb81ed88555bcd44d09b0cf50cc734598 (patch)
tree632cb2974be9c92f0d11e5f97eaea35e9207215e /main/xulrunner/uclibc-malloc_usable_size.patch
parent1d8737f8e21eca4bc92df4be80848b67da3c3c2a (diff)
downloadaports-4a300b5cb81ed88555bcd44d09b0cf50cc734598.tar.bz2
aports-4a300b5cb81ed88555bcd44d09b0cf50cc734598.tar.xz
main/xulrunner: upgrade to 28.0
ref #2522
Diffstat (limited to 'main/xulrunner/uclibc-malloc_usable_size.patch')
-rw-r--r--main/xulrunner/uclibc-malloc_usable_size.patch20
1 files changed, 11 insertions, 9 deletions
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
index b4a009317b..f9e726d55b 100644
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ b/main/xulrunner/uclibc-malloc_usable_size.patch
@@ -1,19 +1,21 @@
---- mozilla-release-old/memory/mozalloc/Makefile.in
-+++ mozilla-release/memory/mozalloc/Makefile.in
-@@ -43,6 +43,10 @@
-
- include $(DEPTH)/config/autoconf.mk
+diff -ru mozilla-release.orig/memory/mozalloc/Makefile.in mozilla-release/memory/mozalloc/Makefile.in
+--- mozilla-release.orig/memory/mozalloc/Makefile.in 2014-03-15 05:19:31.000000000 +0000
++++ mozilla-release/memory/mozalloc/Makefile.in 2014-04-17 12:57:18.819942458 +0000
+@@ -3,6 +3,10 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ifdef MOZ_MEMORY
+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) $(call EXPAND_LIBNAME_PATH,memory,../build)
+endif
+
- VISIBILITY_FLAGS=
STL_FLAGS =
ifdef _MSC_VER
---- ./memory/mozalloc/mozalloc.cpp.orig 2013-02-15 21:15:06.000000000 +0000
-+++ ./memory/mozalloc/mozalloc.cpp 2013-02-20 08:00:26.328809270 +0000
-@@ -30,7 +30,7 @@
+ STL_FLAGS = -D_HAS_EXCEPTIONS=0
+diff -ru mozilla-release.orig/memory/mozalloc/mozalloc.cpp mozilla-release/memory/mozalloc/mozalloc.cpp
+--- mozilla-release.orig/memory/mozalloc/mozalloc.cpp 2014-03-15 05:19:31.000000000 +0000
++++ mozilla-release/memory/mozalloc/mozalloc.cpp 2014-04-17 12:55:15.007704929 +0000
+@@ -28,7 +28,7 @@
#include "mozilla/mozalloc_oom.h" // for mozalloc_handle_oom
/* Windows doesn't have malloc_usable_size, but jemalloc has */