[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/gcc-HelpLinker.diff |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit b8ec4ae07ebc3af579073a4c3bbd1f324683c5b5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 14:16:55 2011 +0300

    Make gcc-HelpLinker.diff apply again

diff --git a/patches/dev300/gcc-HelpLinker.diff b/patches/dev300/gcc-HelpLinker.diff
index 3266a6d..cccf8b2 100644
--- a/patches/dev300/gcc-HelpLinker.diff
+++ b/patches/dev300/gcc-HelpLinker.diff
@@ -20,18 +20,14 @@ index 3196d23..2841da2 100644
   
  .IF "$(SYSTEM_LIBXSLT)" == "YES"
  CFLAGS+= $(LIBXSLT_CFLAGS)
-diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
-index ab54779..e08e0ac 100644
 --- l10ntools/source/makefile.mk
 +++ l10ntools/source/makefile.mk
-@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
- .INCLUDE :  settings.mk
+@@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
+ 
  CDEFS+= -DYY_NEVER_INTERACTIVE=1
- #CDEFS+= -pg
-+CDEFS+= -O0
  
++CDEFS+= -O0
++ 
  .IF "$(SYSTEM_EXPAT)" == "YES"
  CFLAGS+=-DSYSTEM_EXPAT
--- 
-1.7.0.1
-
+ .ENDIF