[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[René Engelhard]

 patches/dev300/apply               |    3 +++
 patches/dev300/gcc-HelpLinker.diff |   20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit e7fb48146a5619c2e477b6468d0753bb01f5e45e
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 22 00:14:09 2010 +0100

    work around HelpLinker miscompile with gcc 4.3
    
    * patches/dev300/apply:
    * patches/dev300/gcc-HelpLinker.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5bbbc45..76de5ca 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -293,6 +293,9 @@ registry-speed-fix.diff, thorsten
 # it helps to avoid some crashes
 jvmfwk-sunjavaplugin-default-stack-size.diff, n#572372, pmladek
 
+# don't let HelpLinker be miscompiled with g++ 4.3
+gcc-HelpLinker.diff
+
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
diff --git a/patches/dev300/gcc-HelpLinker.diff b/patches/dev300/gcc-HelpLinker.diff
new file mode 100644
index 0000000..0a984fc
--- /dev/null
+++ b/patches/dev300/gcc-HelpLinker.diff
@@ -0,0 +1,20 @@
+--- transex3/source/makefile.mk.orig  2010-02-19 12:20:48.000000000 +0100
++++ transex3/source/makefile.mk 2010-02-18 19:49:58.000000000 +0100
+@@ -43,6 +43,7 @@
+ .INCLUDE :  settings.mk
+ CDEFS+= -DYY_NEVER_INTERACTIVE=1
+ #CDEFS+= -pg
++CDEFS+= -O0
+ 
+ .IF "$(SYSTEM_EXPAT)" == "YES"
+ CFLAGS+=-DSYSTEM_EXPAT
+--- transex3/source/help/makefile.mk.orig 2010-02-19 12:20:52.000000000 +0100
++++ transex3/source/help/makefile.mk  2010-02-19 11:45:26.000000000 +0100
+@@ -40,6 +40,7 @@
+ 
+ .INCLUDE : settings.mk
+ .INCLUDE : helplinker.pmk
++CDEFS+= -O0
+  
+ .IF "$(SYSTEM_LIBXSLT)" == "YES"
+ CFLAGS+= $(LIBXSLT_CFLAGS)