jurt/Library_jpipe.mk | 6 ++++++
jurt/source/pipe/staticsalhack.cxx | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
New commits:
commit 4e3e87e88d2d450c87680b31f12906bc41da79f1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 7 08:57:33 2016 +0100
Adapt jurt staticsalhack to MACOSX
Change-Id: I0525b68cdb097edd3241809ae0dc9c22e1ad9814
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 3ddac8c..dbe0b89 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -72,6 +72,12 @@ $(eval $(call gb_Library_use_externals,jpipe, \
boost_headers \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \
+ CoreFoundation \
+))
+endif
+
$(eval $(call gb_Library_add_libs,jpipe, \
$(if $(filter-out $(OS),ANDROID),-lpthread) \
))
diff --git a/jurt/source/pipe/staticsalhack.cxx
b/jurt/source/pipe/staticsalhack.cxx
index 23afde1..a527d09 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -13,6 +13,10 @@
#undef SAL_LOG_INFO
#undef SAL_LOG_WARN
+#include <sal/config.h>
+
+#include <cstdlib>
+
#include <sal/rtl/string.cxx>
#include <sal/rtl/ustring.cxx>
@@ -57,4 +61,19 @@
#include <sal/textenc/textenc.cxx>
#include <sal/textenc/unichars.cxx>
+#if defined MACOSX
+#include <sal/osl/unx/osxlocale.cxx>
+#include <sal/osl/unx/system.cxx>
+#endif
+
+// Called from FullTextEncodingData::get in sal/textenc/textenc.cxx, but only
+// defined for ANDROID (in ANDROID-specific sal/textenc/tables.cxx); would even
+// work to leave it undefined for LINUX due to no '-z defs' under -fsanitize=*
+// (solenv/gbuild/platform/linux.mk), but not for MACOSX:
+extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
+ rtl_TextEncoding)
+{
+ std::abort();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
