From d2e547c82dd23eabfec7a828c5b9fed16313b1c4 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Sat, 7 Apr 2018 19:28:17 +0200
Subject: libmspub: fix build for android-arm with debug enabled

Change-Id: I2fff80f2e4a0bd1946c9b49d46871245f93bbb3e
---
 external/libmspub/UnpackedTarball_libmspub.mk  |  6 ++++++
 external/libmspub/libmspub_android_arm.patch.1 | 12 ++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 external/libmspub/libmspub_android_arm.patch.1

(limited to 'external')

diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk
index 5ea3053d6f69..5e5bedb27d83 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -19,6 +19,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub))
 
+ifeq ($(ANDROID_APP_ABI),armeabi-v7a)
+$(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
+    external/libmspub/libmspub_android_arm.patch.1 \
+))
+endif
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
diff --git a/external/libmspub/libmspub_android_arm.patch.1 b/external/libmspub/libmspub_android_arm.patch.1
new file mode 100644
index 000000000000..2d7d0e12c02a
--- /dev/null
+++ b/external/libmspub/libmspub_android_arm.patch.1
@@ -0,0 +1,12 @@
+diff -ur libmspub.org/src/lib/libmspub_utils.cpp libmspub/src/lib/libmspub_utils.cpp
+--- libmspub.org/src/lib/libmspub_utils.cpp	2018-04-07 15:13:32.041792236 +0200
++++ libmspub/src/lib/libmspub_utils.cpp	2018-04-07 15:14:08.547790739 +0200
+@@ -29,7 +29,7 @@
+ {
+   va_list args;
+   va_start(args, format);
+-  std::vfprintf(stderr, format, args);
++  vfprintf(stderr, format, args);
+   va_end(args);
+ }
+ 
-- 
cgit