[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Chris Cheney]

 patches/dev300/ubuntu-arm-thumb.diff |  108 ++++++++++++++++++++++++++++++-----
 1 file changed, 94 insertions(+), 14 deletions(-)

New commits:
commit 49c7530fbc9a9679c23e5349376c59545e51b030
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Wed Jan 27 00:04:32 2010 -0600

    Update ubuntu-arm-thumb for OOo 3.2 properly this time
    
    * patches/dev300/ubuntu-arm-thumb.diff: Update ubuntu-arm-thumb properly this
      time. Thanks to Matthias Klose <doko at ubuntu.com>

diff --git a/patches/dev300/ubuntu-arm-thumb.diff b/patches/dev300/ubuntu-arm-thumb.diff
index 6139220..6dfcd0e 100644
--- a/patches/dev300/ubuntu-arm-thumb.diff
+++ b/patches/dev300/ubuntu-arm-thumb.diff
@@ -1,24 +1,104 @@
---- solenv/inc/unxlngr.mk.orig	2010-01-15 21:15:20.000000000 -0600
-+++ solenv/inc/unxlngr.mk	2010-01-20 14:02:29.000000000 -0600
-@@ -31,7 +31,7 @@
- 
- # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
- 
--CDEFAULTOPT=-Os
-+CDEFAULTOPT=-O2
- .INCLUDE : unxlng.mk
- CDEFS+=-DARM32
- CFLAGS+=-fno-omit-frame-pointer
---- tools/source/datetime/makefile.mk.orig	2010-01-15 21:15:20.000000000 -0600
-+++ tools/source/datetime/makefile.mk	2010-01-20 13:56:49.000000000 -0600
+--- tools/source/datetime/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
++++ tools/source/datetime/makefile.mk	2010-01-20 17:12:10.000000000 +0000
 @@ -39,6 +39,10 @@
  .INCLUDE :  settings.mk
  .INCLUDE :      $(PRJ)$/util$/makefile.pmk
  
 +.IF "$(CPUNAME)"=="ARM"
-+CFLAGSOPT += -O2
++CFLAGS += -O2
 +.ENDIF
 +
  # --- Files --------------------------------------------------------
  
  SLOFILES=   $(SLO)$/tdate.obj     \
+--- vcl/source/gdi/makefile.mk.orig	2010-01-20 17:49:23.000000000 +0000
++++ vcl/source/gdi/makefile.mk	2010-01-20 21:03:00.000000000 +0000
+@@ -49,6 +49,10 @@
+ CDEFS+=-DENABLE_GRAPHITE
+ .ENDIF
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES=	$(SLO)$/salmisc.obj 	\
+--- vcl/source/window/makefile.mk.orig	2010-01-20 17:48:48.000000000 +0000
++++ vcl/source/window/makefile.mk	2010-01-20 21:20:28.000000000 +0000
+@@ -42,6 +42,10 @@
+ .INCLUDE :	settings.mk
+ .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES= \
+--- svtools/source/contnr/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
++++ svtools/source/contnr/makefile.mk	2010-01-20 22:22:04.000000000 +0000
+@@ -43,6 +43,10 @@
+ .INCLUDE :  settings.mk
+ .INCLUDE :  $(PRJ)$/util$/svt.pmk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ EXCEPTIONSFILES=\
+--- svtools/source/control/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
++++ svtools/source/control/makefile.mk	2010-01-20 22:30:01.000000000 +0000
+@@ -39,6 +39,10 @@
+ .INCLUDE :	settings.mk
+ .INCLUDE :  $(PRJ)$/util$/svt.pmk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ SRS1NAME=$(TARGET)
+--- basic/source/app/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
++++ basic/source/app/makefile.mk	2010-01-21 02:32:52.000000000 +0000
+@@ -40,6 +40,10 @@
+ 
+ .INCLUDE :  settings.mk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Common ------------------------------------------------------------
+ 
+ OBJFILES = \
+--- extensions/source/propctrlr/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
++++ extensions/source/propctrlr/makefile.mk	2010-01-21 23:17:39.000000000 +0000
+@@ -42,6 +42,10 @@
+ 
+ .INCLUDE :	$(PRJ)$/util$/makefile.pmk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES=           $(SLO)$/controlfontdialog.obj \
+--- forms/source/richtext/makefile.mk.orig	2010-01-10 07:36:00.000000000 +0000
++++ forms/source/richtext/makefile.mk	2010-01-22 00:09:17.000000000 +0000
+@@ -39,6 +39,10 @@
+ .INCLUDE : settings.mk
+ .INCLUDE: $(PRJ)$/makefile.pmk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -O2
++.ENDIF
++
+ # --- Files -------------------------------------
+ 
+ EXCEPTIONSFILES=\