summaryrefslogtreecommitdiff
path: root/external/cairo
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-01-16 01:16:08 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-01-16 01:19:10 +0100
commiteed4cc7933b2a46f421bb469652b85a58831b3c3 (patch)
tree6c831167a02598c51f666cddb0bd8b8f3601d462 /external/cairo
parent0174562fa9e49bf989a571c6ccd51e558109b561 (diff)
android x86 doesn't define ffs in libc, use compiler builtin instead
Change-Id: Ifde1184e469fc9a74de007a0caf27750b2ffbcbb
Diffstat (limited to 'external/cairo')
-rw-r--r--external/cairo/cairo/cairo-1.10.2.android.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/external/cairo/cairo/cairo-1.10.2.android.patch b/external/cairo/cairo/cairo-1.10.2.android.patch
index e894063f0d92..237a0d4c2372 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