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

Caolán McNamara caolanm at fedoraproject.org
Thu Jan 26 09:59:03 UTC 2012


commit 7b01c86fe1c59f0269f4899692fca38df2eacba4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 26 09:58:58 2012 +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 d5ef5e4..dee1b9d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -160,6 +160,7 @@ Patch41: libreoffice-rhel6langs.patch
 Patch42: solenv.fix.mk.inheritance.patch
 Patch43: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 Patch44: 0001-Resolves-fdo-44078-fix-unfortunate-name-alias-mixups.patch
+Patch45: 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}
@@ -992,6 +993,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch42 -p1 -b .solenv.fix.mk.inheritance.patch
 %patch43 -p1 -b .rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 %patch44 -p1 -b .fdo44078-fix-unfortunate-name-alias-mixups.patch
+%patch45 -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