[libreoffice] ironically noopt means output .o is too big for ppc64

Caolán McNamara caolanm at fedoraproject.org
Wed Nov 16 15:00:56 UTC 2011


commit 0aaa4260251d8c1fbe7478494314fb379b1b6c38
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 16 15:00:50 2011 +0000

    ironically noopt means output .o is too big for ppc64

 libreoffice-ppc64.patch |   14 ++++++++++++++
 libreoffice.spec        |    2 ++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/libreoffice-ppc64.patch b/libreoffice-ppc64.patch
new file mode 100644
index 0000000..fc0c0d3
--- /dev/null
+++ b/libreoffice-ppc64.patch
@@ -0,0 +1,14 @@
+diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk
+index 73e049f..2aba722 100644
+--- a/writerfilter/source/resourcemodel/makefile.mk
++++ b/writerfilter/source/resourcemodel/makefile.mk
+@@ -40,9 +40,6 @@ CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
+ # --- Files --------------------------------------------------------
+ 
+ # work around gcc taking hours and/or OOM'ing on this file
+-NOOPTFILES= \
+-    $(SLO)$/qnametostr.obj
+-
+ SLOFILES= \
+     $(SLO)$/Fraction.obj \
+     $(SLO)$/LoggedResources.obj \
diff --git a/libreoffice.spec b/libreoffice.spec
index 595fd76..352e18a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -143,6 +143,7 @@ Patch37: 0001-Related-i58612-don-t-crash-anyway.patch
 Patch38: 0001-fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
 Patch39: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 Patch40: solenv.fix.mk.inheritance.patch
+Patch41: libreoffice-ppc64.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -829,6 +830,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch38 -p1 -b .fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
 %patch39 -p1 -b .rhbz753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 %patch40 -p1 -b .solenv.fix.mk.inheritance.patch
+%patch41 -p1 -b .libreoffice-ppc64.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings


More information about the scm-commits mailing list