Patchwork gnupg: fix build failure on MIPS64

login
register
mail settings
Submitter Thomas Petazzoni
Date Dec. 16, 2012, 2:59 p.m.
Message ID <1355669943-13925-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/206678/
State Accepted
Commit 835c29a965f62e9da16e3535c0155b2b0219c191
Headers show

Comments

Thomas Petazzoni - Dec. 16, 2012, 2:59 p.m.
Fixes:

  http://autobuild.buildroot.org/results/49d5891dcecf2cce8de9f2bdb16a76ff86579f45/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gnupg/gnupg-mips64-build-fix.patch |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/gnupg/gnupg-mips64-build-fix.patch
Peter Korsgaard - Dec. 16, 2012, 3:52 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Fixes:
 Thomas>   http://autobuild.buildroot.org/results/49d5891dcecf2cce8de9f2bdb16a76ff86579f45/build-end.log

Committed, thanks.

Patch

diff --git a/package/gnupg/gnupg-mips64-build-fix.patch b/package/gnupg/gnupg-mips64-build-fix.patch
new file mode 100644
index 0000000..014435c
--- /dev/null
+++ b/package/gnupg/gnupg-mips64-build-fix.patch
@@ -0,0 +1,20 @@ 
+Fix build issue on MIPS64
+
+On MIPS64, there is a syntax problem in the preprocessor
+conditions. Fix that to avoid a build failure.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/mpi/longlong.h
+===================================================================
+--- a/mpi/longlong.h
++++ b/mpi/longlong.h
+@@ -752,7 +752,7 @@
+     (w1) = _r >> 64;                                                    \
+     (w0) = (UDItype) _r;                                                \
+   } while (0)
+-# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++# elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #  define umul_ppmm(w1, w0, u, v)                                       \
+      __asm__ ("dmultu %2,%3"                                            \
+               : "=l" ((UDItype)(w0)),                                   \