[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - patches/dev300
Chris Cheney
ccheney at kemper.freedesktop.org
Thu May 27 09:20:58 PDT 2010
patches/dev300/apply | 5 +
patches/dev300/arm-vis.diff | 13 +++
patches/dev300/ubuntu-arm-thumb.diff | 117 +++++++++++++++++++++++++++++++++++
3 files changed, 135 insertions(+)
New commits:
commit 027800c5fd182a9a797335062ebf6a6800a5fee4
Author: Chris Cheney <ccheney at ubuntu.com>
Date: Thu May 27 11:18:51 2010 -0500
Add the Ubuntu ARM patches for Maverick
* patches/dev300/apply: Add the Ubuntu ARM patches for Maverick
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b4e0d61..6e89104 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3362,11 +3362,13 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
[ UbuntuKarmicOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+arm-vis.diff, cmc
[ UbuntuLucidOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
arm-vis.diff, cmc
+ubuntu-arm-thumb.diff, doko
[ UbuntuMaverickOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
commit 9e6c5e76189d6a20b22927d901daa21078d00ec4
Author: Chris Cheney <ccheney at ubuntu.com>
Date: Thu May 27 11:03:32 2010 -0500
Ubuntu fixes for building on ARM (from 3.2 branch)
* patches/dev300/apply:
* patches/dev300/arm-vis.diff: Fix configure check to test for a visibility
bug in GCC on ARM.
* patches/dev300/ubuntu-arm-thumb.diff: Build with -fno-schedule-insns instead
of -Os on ARM to work around GCC register spill errors.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 72a760d..b4e0d61 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3366,10 +3366,13 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
[ UbuntuLucidOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+arm-vis.diff, cmc
[ UbuntuMaverickOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+arm-vis.diff, cmc
+ubuntu-arm-thumb.diff, doko
[ Fixes ]
# Fix for crash on Windows by Rail Aliev. Root cause unknown.
diff --git a/patches/dev300/arm-vis.diff b/patches/dev300/arm-vis.diff
new file mode 100644
index 0000000..15a834d
--- /dev/null
+++ b/patches/dev300/arm-vis.diff
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 276718)
++++ configure.in (working copy)
+@@ -2710,7 +2710,7 @@
+ if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
+ gccvisbroken=yes
+ else
+- if $EGREP -q '@PLT|\$stub' visibility.s; then
++ if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then
+ gccvisbroken=no;
+ else
+ gccvisbroken=yes;
diff --git a/patches/dev300/ubuntu-arm-thumb.diff b/patches/dev300/ubuntu-arm-thumb.diff
new file mode 100644
index 0000000..16a12dc
--- /dev/null
+++ b/patches/dev300/ubuntu-arm-thumb.diff
@@ -0,0 +1,117 @@
+--- 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"
++CFLAGS += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.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 += -fno-schedule-insns
++.ENDIF
++
+ # --- Files -------------------------------------
+
+ EXCEPTIONSFILES=\
+--- oox/source/xls/makefile.mk.orig 2010-01-10 07:36:00.000000000 +0000
++++ oox/source/xls/makefile.mk 2010-01-21 14:35:10.000000000 +0000
+@@ -42,6 +42,10 @@
+ .INCLUDE : settings.mk
+ .INCLUDE: $(PRJ)$/util$/makefile.pmk
+
++.IF "$(CPUNAME)"=="ARM"
++CFLAGS += -fno-schedule-insns
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+
+ SLOFILES = \
More information about the ooo-build-commit
mailing list