[ooo-build-commit] .: patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Thu May 20 10:19:14 PDT 2010


 patches/dev300/apply                             |    2 -
 patches/dev300/sal-cpprt-gcc-4.5-workaround.diff |   28 -----------------------
 2 files changed, 30 deletions(-)

New commits:
commit 05da4655da4bd797fa0f0a206e7d4fc89f8eab83
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 20 19:18:06 2010 +0200

    Bin obsolete hack for gcc-4.5
    
    * patches/dev300/sal-cpprt-gcc-4.5-workaround.diff:
    * patches/dev300/apply: bin the above diff; gcc-4.5 has been fixed long
      time ago

diff --git a/patches/dev300/apply b/patches/dev300/apply
index dc567f3..2cad2de 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1180,8 +1180,6 @@ oox-tokenmap.string.h.diff, i#105219
 
 # enable build with gcc-4.5
 cppu-lbnames-enable-gcc-4.5.diff, i#109853, pmladek
-# compile with -fno-ipa-sra as a workaround for a bug in gcc
-sal-cpprt-gcc-4.5-workaround.diff, gcc#43257, pmladek
 
 [ Java14 ]
 
diff --git a/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff b/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
deleted file mode 100644
index 608a6d1..0000000
--- a/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From c49e78c8c76bc1c8aad8758d7ab3baf7937f4e17 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:57:58 +0200
-Subject: [PATCH 256/768] sal-cpprt-gcc-4.5-workaround.diff
-
----
- sal/cpprt/makefile.mk |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git sal/cpprt/makefile.mk sal/cpprt/makefile.mk
-index 1cba8ee..2b43726 100644
---- sal/cpprt/makefile.mk
-+++ sal/cpprt/makefile.mk
-@@ -39,6 +39,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 =	\
--- 
-1.7.0.1
-


More information about the ooo-build-commit mailing list