[libreoffice/f16] fix s390x

[Caolán McNamara]

commit 707bb0c024a19a851333f23e9c057202aef5151c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 16 20:27:10 2012 +0000

    fix s390x

 libreoffice.spec                |    2 ++
 solenv.fix.mk.inheritance.patch |   13 +++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 13e2594..0ea7d13 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -162,6 +162,7 @@ Patch44: libreoffice-gcj.patch
 Patch45: libreoffice-rhel6poppler.patch
 Patch46: libreoffice-rhel6langs.patch
 %endif
+Patch47: solenv.fix.mk.inheritance.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -988,6 +989,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch45 -p0 -b .rhel6poppler.patch
 %patch46 -p0 -b .rhel6langs.patch
 %endif
+%patch47 -p1 -b .solenv.fix.mk.inheritance.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
diff --git a/solenv.fix.mk.inheritance.patch b/solenv.fix.mk.inheritance.patch
new file mode 100644
index 0000000..333b983
--- /dev/null
+++ b/solenv.fix.mk.inheritance.patch
@@ -0,0 +1,13 @@
+diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk
+index 410038e..fae49f4 100755
+--- a/solenv/gbuild/platform/linux-S390.mk
++++ b/solenv/gbuild/platform/linux-S390.mk
+@@ -28,7 +28,7 @@
+ #*************************************************************************
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+-gb_CPUDEFS += -D$(CPUNAME)
++gb_CPUDEFS += -DS390
+ gb_Library_DLLPOSTFIX := l3
+ gb_COMPILERDEFAULTOPTFLAGS := -O2
+ gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer