[libreoffice] really fix ppc64 build
David Tardon
dtardon at fedoraproject.org
Thu Aug 28 11:47:57 UTC 2014
commit c59b0bd55fb0c034f9960bc91f40ae0edd6707fd
Author: David Tardon <dtardon at redhat.com>
Date: Thu Aug 28 13:47:45 2014 +0200
really fix ppc64 build
0001-fix-variable-name.patch | 26 ++++++++++++++++++++++++++
libreoffice.spec | 1 +
2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/0001-fix-variable-name.patch b/0001-fix-variable-name.patch
new file mode 100644
index 0000000..064d86c
--- /dev/null
+++ b/0001-fix-variable-name.patch
@@ -0,0 +1,26 @@
+From b38de1f8f3712f0a632ff9b6fa10df2cf3ce268f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 28 Aug 2014 13:44:13 +0200
+Subject: [PATCH] fix variable name
+
+Change-Id: I170f0390f8f510591d444f44c20434b15077e687
+---
+ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+index cfe720d..5836d8b 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+@@ -233,7 +233,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
+ "fmr %0, 1\n\t"
+ : "=f" (dret), "=r" (r3), "=r" (r4) : );
+
+- MapReturn(r3, r4, dret, pReturnTypeRef, pRegisterReturn);
++ MapReturn(r3, r4, dret, pReturnTypeDescr, pRegisterReturn);
+ }
+
+ // Macros for easier insertion of values to registers or stack
+--
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 43e2ff0..c167325 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -308,6 +308,7 @@ Patch20: 0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch
Patch21: 0001-Related-rhbz-1130264-plausible-fix-for-reported-cras.patch
Patch22: 0001-Resolves-rhbz-1125588-port-LibreOffice-to-ppc64le.patch
Patch23: 0001-if-_CALL_ELF-if-defined-_CALL_ELF-_CALL_ELF-2.patch
+Patch24: 0001-fix-variable-name.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
More information about the scm-commits
mailing list