diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-04-07 19:28:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-06-05 21:46:17 +0200 |
| commit | 89915761e234fffcf1655e1bc29d7c9cf395c449 (patch) | |
| tree | 6fdaac9086f3baf97b37274b07b88f7c72b6d498 /external | |
| parent | 8c99c69dd29af6e5b1004a8ec4a6358bd59dd406 (diff) | |
libmspub: fix build for android-arm with debug enabled
Change-Id: I2fff80f2e4a0bd1946c9b49d46871245f93bbb3e
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk | 6 | ||||
| -rw-r--r-- | external/libmspub/libmspub_android_arm.patch.1 | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index ecf1066e2eb3..a85d82842466 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -20,6 +20,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); + } + |