[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply           |    2 --
 patches/dev300/debian-opt.diff |   11 +++++++++++
 patches/dev300/ubuntu-opt.diff |   11 -----------
 3 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 9abd31dafcdca7bf73d84ae148fd2700bfb0726f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 14 01:11:37 2009 +0100

    move ppc optimization fix from ubuntu-opt.diff to debian-opt.diff
    
    * patches/dev300/ubuntu-opt.diff: remove. Copy ..
    * patches/dev300/debian-opt.diff: ... here
    * patches/dev300/apply: adapt

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4b7e75f..b89687a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3330,8 +3330,6 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
 ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 xulrunner-1.9.1.diff, ccheney
-# -Os in karmic on powerpc doesn't work, copy to Lucid as well ...
-ubuntu-opt.diff, mklose
 
 [ Fixes ]
 # Fix for crash on Windows by Rail Aliev. Root cause unknown.
diff --git a/patches/dev300/debian-opt.diff b/patches/dev300/debian-opt.diff
index a723e1e..e61f48d 100644
--- a/patches/dev300/debian-opt.diff
+++ b/patches/dev300/debian-opt.diff
@@ -20,3 +20,14 @@
  .ELSE 	# "$(PRODUCT)"!=""
  CFLAGSOPT=   							# no optimizing for non products
  .ENDIF	# "$(PRODUCT)"!=""
+--- solenv/inc/unxlngppc4.mk~	2009-09-27 10:32:34.000000000 +0000
++++ solenv/inc/unxlngppc4.mk	2009-09-27 11:11:22.000000000 +0000
+@@ -102,7 +102,7 @@
+ CFLAGSDBGUTIL=
+ 
+ # Compiler flags for enabling optimizations
+-CFLAGSOPT=-Os -fno-strict-aliasing
++CFLAGSOPT=-O2 -fno-strict-aliasing
+ 
+ # Compiler flags for disabling optimizations
+ # don't change - required to work around optimization bugs
diff --git a/patches/dev300/ubuntu-opt.diff b/patches/dev300/ubuntu-opt.diff
deleted file mode 100644
index 2a49154..0000000
--- a/patches/dev300/ubuntu-opt.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/inc/unxlngppc4.mk~	2009-09-27 10:32:34.000000000 +0000
-+++ solenv/inc/unxlngppc4.mk	2009-09-27 11:11:22.000000000 +0000
-@@ -102,7 +102,7 @@
- CFLAGSDBGUTIL=
- 
- # Compiler flags for enabling optimizations
--CFLAGSOPT=-Os -fno-strict-aliasing
-+CFLAGSOPT=-O2 -fno-strict-aliasing
- 
- # Compiler flags for disabling optimizations
- # don't change - required to work around optimization bugs