ooo-build r15041 - in trunk: . patches/dev300

[hmth svn gnome org]

Author: hmth
Date: Fri Jan  9 09:05:01 2009
New Revision: 15041
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15041&view=rev

Log:
2009-01-09  Hanno Meyer-Thurow  <h mth web de>

	* patches/dev300/system-xmlsec.diff,
	  patches/dev300/gentooexperimental-gnujre.diff: bin unsupported.
	* patches/dev300/disable-parser-jaxp.diff,
	  patches/dev300/vcl_font-NO_LIST.diff: bin unused.
	* patches/dev300/gentoo-sandbox.diff: add, Gentoo sandbox violation fix.
	* patches/dev300/jemalloc.diff: add, FreeBSD7 allocator
	--with-alloc=jemalloc configure option.
	* patches/dev300/ibm-j9vm.diff: fix apply.
	* patches/dev300/apply: update GentooExperimental section.


Added:
   trunk/patches/dev300/gentoo-sandbox.diff
   trunk/patches/dev300/jemalloc.diff
Removed:
   trunk/patches/dev300/disable-parser-jaxp.diff
   trunk/patches/dev300/gentooexperimental-gnujre.diff
   trunk/patches/dev300/system-xmlsec.diff
   trunk/patches/dev300/vcl_font-NO_LIST.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ibm-j9vm.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jan  9 09:05:01 2009
@@ -1589,10 +1589,10 @@
 [ GentooExperimental ]
 SectionOwner => hmth
 
-# Gnu JRE paths.
-gentooexperimental-gnujre.diff
-# test system libxmlsec
-system-xmlsec.diff
+# jemalloc, FreeBSD 7 allocator
+jemalloc.diff
+# Sandbox problem with wrong path
+sandbox.diff
 
 [ GentooOnly ]
 SectionOwner => aprosky
@@ -1607,12 +1607,8 @@
 system-db-check.diff, i#65979, hmth
 # User ~/.ooo3 as user dir
 scp2-user-config-ooo3.diff, pmladek
-# unused java code, hmth
-#disable-parser-jaxp.diff
 # default inc/lib
 config_office-XINC-XLIB-defaults.diff, i#65976
-# gdi/font.cxx: stl list error, hmth
-#vcl_font-NO_LIST.diff
 # linux-headers-2.6.22 issue?!
 linux-headers.diff
 

Added: trunk/patches/dev300/gentoo-sandbox.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/gentoo-sandbox.diff	Fri Jan  9 09:05:01 2009
@@ -0,0 +1,11 @@
+--- officecfg/util/makefile.mk 
++++ officecfg/util/makefile.mk 
+@@ -41,7 +41,6 @@
+ 
+ $(MISC)$/$(TARGET)_delzip :
+ 	-$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
+-	-$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
+ 
+ $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
+ 	cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
+

Modified: trunk/patches/dev300/ibm-j9vm.diff
==============================================================================
--- trunk/patches/dev300/ibm-j9vm.diff	(original)
+++ trunk/patches/dev300/ibm-j9vm.diff	Fri Jan  9 09:05:01 2009
@@ -6,9 +6,9 @@
  #else
 +        "/bin/j9vm/libjvm.so", // for IBM Java
 +        "/jre/bin/j9vm/libjvm.so", // for IBM Java
- 	"/bin/classic/libjvm.so", // for IBM Java
-         "/jre/bin/classic/libjvm.so", // for IBM Java
          "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
+         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
+         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
 @@ -101,6 +103,8 @@
  #else
          "/bin",

Added: trunk/patches/dev300/jemalloc.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/jemalloc.diff	Fri Jan  9 09:05:01 2009
@@ -0,0 +1,87 @@
+--- config_office/configure.in.orig	2008-03-18 19:27:49.000000000 +0100
++++ config_office/configure.in	2008-03-18 19:29:49.000000000 +0100
+@@ -745,7 +745,7 @@
+ ],,)
+ AC_ARG_WITH(alloc,
+ [  --with-alloc            Define which allocator to build with
+-			                 (choices are oo, system, tcmalloc)
++			  (choices are oo, system, tcmalloc, jemalloc)
+ ],,)
+ 
+ BUILD_TYPE="OOo EXT"
+@@ -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 FreeBSD 7 allocator)], [])
++    ALLOC="JEMALLOC";
++    CFLAGS=$save_CFLAGS
++fi
+ if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
+    AC_MSG_RESULT([internal])
+ fi
+--- solenv/inc/unxlngi4.mk.orig	2008-03-18 19:38:13.000000000 +0100
++++ solenv/inc/unxlngi4.mk	2008-03-18 19:39:14.000000000 +0100
+@@ -180,6 +180,13 @@
+ STDSHLCUIMT+=-ltcmalloc
+ .ENDIF
+ 
++.IF "$(ALLOC)" == "JEMALLOC"
++STDLIBGUIMT+=-ljemalloc
++STDLIBCUIMT+=-ljemalloc
++STDSHLGUIMT+=-ljemalloc
++STDSHLCUIMT+=-ljemalloc
++.ENDIF
++
+ # libraries for linking applications
+ STDLIBGUIMT+=-lX11 -ldl -lpthread -lm
+ STDLIBCUIMT+=-ldl -lpthread -lm
+--- solenv/inc/unxlngi6.mk.orig	2008-03-18 19:38:20.000000000 +0100
++++ solenv/inc/unxlngi6.mk	2008-03-18 19:39:49.000000000 +0100
+@@ -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=gnu
+ .ELSE
+--- solenv/inc/unxlngx6.mk.orig	2008-03-19 18:35:36.000000000 +0100
++++ solenv/inc/unxlngx6.mk	2008-03-19 18:36:47.000000000 +0100
+@@ -83,6 +83,14 @@
+ CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+ 
+ .ENDIF
++
++.IF "$(ALLOC)" == "JEMALLOC"
++STDLIBGUIMT+=-ljemalloc
++STDLIBCUIMT+=-ljemalloc
++STDSHLGUIMT+=-ljemalloc
++STDSHLCUIMT+=-ljemalloc
++.ENDIF
++
+ .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+ LINKFLAGS += -Wl,--hash-style=gnu
+ .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
+