diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-12 10:42:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-12 10:42:15 +0000 |
| commit | cd46eba6f617f9d99d6485c14d2375fb4bdd68ca (patch) | |
| tree | 0a28dbf530e1bf63dc2fae356ea0c134988207d1 /main/xulrunner/0004-xulrunner-malloc_usable_size.patch | |
| parent | ec35bbd33549a6d71640b9b9e77d1a9142e8fbd8 (diff) | |
| download | aports-cd46eba6f617f9d99d6485c14d2375fb4bdd68ca.tar.bz2 aports-cd46eba6f617f9d99d6485c14d2375fb4bdd68ca.tar.xz | |
main/firefox,xulrunner: upgrade to 10.0.1
Diffstat (limited to 'main/xulrunner/0004-xulrunner-malloc_usable_size.patch')
| -rw-r--r-- | main/xulrunner/0004-xulrunner-malloc_usable_size.patch | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch b/main/xulrunner/0004-xulrunner-malloc_usable_size.patch index aae416c7da..986b183ece 100644 --- a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch +++ b/main/xulrunner/0004-xulrunner-malloc_usable_size.patch @@ -1,25 +1,34 @@ -From a2a15c826a5e1743ba71288543b9e144603fba26 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 25 Nov 2011 08:40:53 +0000 -Subject: [PATCH 4/4] xulrunner: malloc_usable_size +From: Timo Teräs <timo.teras@iki.fi> ---- - memory/mozalloc/mozalloc.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp -index 58e5192..500c651 100644 ---- a/memory/mozalloc/mozalloc.cpp -+++ b/memory/mozalloc/mozalloc.cpp -@@ -267,7 +267,7 @@ moz_malloc_usable_size(void *ptr) - #if defined(XP_MACOSX) - return malloc_size(ptr); - #elif defined(MOZ_MEMORY) -- return malloc_usable_size(ptr); -+ return 0; - #elif defined(XP_WIN) - return _msize(ptr); - #else --- -1.7.7.4 +malloc_usable_size is not defined on uclibc, so workaround +that in jemalloc. Fix mozalloc linking. +--- mozilla-release-old/memory/jemalloc/jemalloc.h ++++ mozilla-release/memory/jemalloc/jemalloc.h +@@ -75,8 +75,12 @@ + /* Linux has memalign and malloc_usable_size */ + #if !defined(MOZ_MEMORY_LINUX) + void *memalign(size_t alignment, size_t size); +-size_t malloc_usable_size(const void *ptr); + #endif /* MOZ_MEMORY_LINUX */ ++ ++#include <features.h> ++#if defined(__UCLIBC__) || !defined(MOZ_MEMORY_LINUX) ++size_t malloc_usable_size(const void *ptr); ++#endif + + void jemalloc_stats(jemalloc_stats_t *stats); + +--- mozilla-release-old/memory/mozalloc/Makefile.in ++++ mozilla-release/memory/mozalloc/Makefile.in +@@ -43,6 +43,10 @@ + + include $(DEPTH)/config/autoconf.mk + ++ifdef MOZ_MEMORY ++SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) ++endif ++ + VISIBILITY_FLAGS= + STL_FLAGS = + ifdef _MSC_VER |