[ooo-build-commit] .: patches/dev300

[Hanno Meyer-Thurow]

 patches/dev300/apply         |    2 -
 patches/dev300/jemalloc.diff |   56 -------------------------------------------
 2 files changed, 58 deletions(-)

New commits:
commit 0774e0501c152b623ffb2d2f9ec55f501fbc02af
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Sun Oct 3 01:13:55 2010 +0200

    Remove upstreamed jemalloc.diff
    
    * patches/dev300/jemalloc.diff: bin

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 53a7f7a..130a0e3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2750,8 +2750,6 @@ calc-xls-import-mem-footprint.diff, n#637925, kohei
 
 [ GentooExperimental ]
 SectionOwner => hmth
-# jemalloc allocator
-jemalloc.diff, i#111045
 # make Python2 optional
 disable-python.diff
 
diff --git a/patches/dev300/jemalloc.diff b/patches/dev300/jemalloc.diff
deleted file mode 100644
index 847d9a9..0000000
--- a/patches/dev300/jemalloc.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.in.orig	2008-03-18 19:27:49.000000000 +0100
-+++ configure.in	2008-03-18 19:29:49.000000000 +0100
-@@ -745,7 +745,7 @@
- ],with_build_version=$withval)
- AC_ARG_WITH(alloc,
- [  --with-alloc            Define which allocator to build with
--			                 (choices are oo, system, tcmalloc)
-+                           (choices are oo, system, tcmalloc, jemalloc)
- ],,)
- AC_ARG_WITH(sun-templates,
- [
-@@ -2499,6 +2499,14 @@
-         [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
-     ALLOC="TCMALLOC";
- fi
-+if test "$with_alloc" = "jemalloc"; then
-+    save_CFLAGS=$CFLAGS
-+    CFLAGS="$CFLAGS -pthread"
-+    AC_CHECK_LIB(jemalloc, malloc, [],
-+        [AC_MSG_ERROR(jemalloc not found or functional. Install the jemalloc allocator.)], [])
-+    ALLOC="JEMALLOC";
-+    CFLAGS=$save_CFLAGS
-+fi
- if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-    AC_MSG_RESULT([internal])
- fi
-Index: unxlng.mk
-===================================================================
---- solenv/inc/unxlng.mk	(Revision 276754)
-+++ solenv/inc/unxlng.mk	(Arbeitskopie)
-@@ -201,6 +201,14 @@
- STDSHLGUIMT+=-ltcmalloc
- STDSHLCUIMT+=-ltcmalloc
- .ENDIF
-+
-+.IF "$(ALLOC)" == "JEMALLOC"
-+STDLIBGUIMT+=-ljemalloc
-+STDLIBCUIMT+=-ljemalloc
-+STDSHLGUIMT+=-ljemalloc
-+STDSHLCUIMT+=-ljemalloc
-+.ENDIF
-+
- .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
- LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
- .ELSE
---- sal/rtl/source/makefile.mk.orig	2008-03-18 19:41:00.000000000 +0100
-+++ sal/rtl/source/makefile.mk	2008-03-18 19:42:42.000000000 +0100
-@@ -54,7 +54,7 @@
- 
- .INCLUDE :  settings.mk
- 
--.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC"
-+.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC" || "$(ALLOC)" == "JEMALLOC"
- CDEFS+= -DFORCE_SYSALLOC
- .ENDIF
-