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

[Chris Cheney]

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

New commits:
commit 3fb8d81a5bd4b637511befa3a46bb5a537e2ede2
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Mon Oct 12 15:53:49 2009 -0500

    -Os in karmic on powerpc doesn't work
    
    * patches/dev300/apply:
    * patches/dev300/ubuntu-opt.diff: -Os in karmic on powerpc doesn't work

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a3122ed..03571df 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3302,6 +3302,8 @@ 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/ubuntu-opt.diff b/patches/dev300/ubuntu-opt.diff
new file mode 100644
index 0000000..2a49154
--- /dev/null
+++ b/patches/dev300/ubuntu-opt.diff
@@ -0,0 +1,11 @@
+--- 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