external/cairo/cairo/cairo-1.10.2.android.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit eed4cc7933b2a46f421bb469652b85a58831b3c3
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Sat Jan 16 01:16:08 2016 +0100
android x86 doesn't define ffs in libc, use compiler builtin instead
Change-Id: Ifde1184e469fc9a74de007a0caf27750b2ffbcbb
diff --git a/external/cairo/cairo/cairo-1.10.2.android.patch
b/external/cairo/cairo/cairo-1.10.2.android.patch
index e894063..237a0d4 100644
--- a/external/cairo/cairo/cairo-1.10.2.android.patch
+++ b/external/cairo/cairo/cairo-1.10.2.android.patch
@@ -11,3 +11,14 @@
# Parse the version information argument.
save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0
+diff -ur cairo.org/src/cairo-compiler-private.h
cairo/src/cairo-compiler-private.h
+--- a/cairo.org/src/cairo-compiler-private.h 2016-01-16 00:47:17.392420675
+0100
++++ b/cairo/src/cairo-compiler-private.h 2016-01-16 00:51:55.601110129
+0100
+@@ -258,4 +258,7 @@
+ #define inline __inline__
+ #endif
+
++/* no ffs in libc on android x86 (at least not in v15 that we compile
against) */
++#define ffs __builtin_ffs
++
+ #endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
