ooo-build r11896 - in trunk: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar 13 17:55:27 2008
New Revision: 11896
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11896&view=rev

Log:
2008-03-13  Petr Mladek  <pmladek suse cz>

	* patches/src680/buildfix-gcc-4.3-compiler-error.diff,
	  patches/src680/apply: temporary compile sc/source/core/tool with -O1
	  with gcc-4.3 on x86_64 until the internal compiler error is fixed,
	  n#370383 



Added:
   trunk/patches/src680/buildfix-gcc-4.3-compiler-error.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar 13 17:55:27 2008
@@ -201,6 +201,10 @@
 # Fix linkoo, the ultimate hacker tool
 fix-linkoo.diff, i#83548, jholesov
 
+# temporary compile sc/source/core/tool with -O1 with gcc-4.3 on x86_64
+# until the internal compiler error is fixed
+buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
+
 #Fix: no autocorrection when "!" (exclamation mark) was typed
 #This is timar's patch, will be fixed in 3.0 in the stream
 i86580-autocorr-exclamation.diff, i#86580, szalaik

Added: trunk/patches/src680/buildfix-gcc-4.3-compiler-error.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/buildfix-gcc-4.3-compiler-error.diff	Thu Mar 13 17:55:27 2008
@@ -0,0 +1,14 @@
+--- sc/source/core/tool/makefile.mk.old	2008-03-12 15:58:49.000000000 +0100
++++ sc/source/core/tool/makefile.mk	2008-03-12 18:37:14.000000000 +0100
+@@ -58,6 +58,11 @@ CDEFS += -DSC_INFO_OSVERSION=\"$(OS)\"
+ CDEFS += -DSC_INFO_OSVERSION=$(EMQ)"$(OS)$(EMQ)"
+ .ENDIF
+ 
++# temporary hack to avoid internal compiler error with gcc-4.3
++.IF "$(CPUNAME)"=="X86_64" && "$(COMID)"=="gcc3" && "$(CCNUMVER)">="000300040000"
++CFLAGSCXX += -O1
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES =  \