packages: openoffice.org/openoffice.org-hotfix-gcc45.patch (NEW) - fixes bu...

[megabajt]

Author: megabajt                     Date: Sat May  8 09:41:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes build with gcc 4.5 (backported from git master)

---- Files affected:
packages/openoffice.org:
   openoffice.org-hotfix-gcc45.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openoffice.org/openoffice.org-hotfix-gcc45.patch
diff -u /dev/null packages/openoffice.org/openoffice.org-hotfix-gcc45.patch:1.1
--- /dev/null	Sat May  8 11:41:47 2010
+++ packages/openoffice.org/openoffice.org-hotfix-gcc45.patch	Sat May  8 11:41:42 2010
@@ -0,0 +1,31 @@
+--- cppu/inc/uno/lbnames.h.old	2010-02-02 12:49:41.000000000 +0100
++++ cppu/inc/uno/lbnames.h	2010-03-05 17:13:22.000000000 +0100
+@@ -62,12 +62,12 @@ provoking error here, because PP ignores
+ #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
+ #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
+ #define __CPPU_ENV gcc3
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
++#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
+ #define __CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
+ #else
+-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
++#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
+ #endif /* defined (__GNUC__) */
+ #endif /* defined (_MSC_VER) */
+ 
+--- sal/cpprt/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
++++ sal/cpprt/makefile.mk	2010-03-04 18:06:37.000000000 +0100
+@@ -43,6 +43,11 @@ LIBTARGET=NO
+ CFLAGS+= $(LFS_CFLAGS)
+ CXXFLAGS+= $(LFS_CFLAGS)
+ 
++.IF "$(CCNUMVER)" >= "000400050000" && "$(CCNUMVER)" < "000400060000"
++CFLAGS+= -fno-ipa-sra
++CXXFLAGS+= -fno-ipa-sra
++.ENDIF 
++
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES =	\
================================================================