desktop/CustomTarget_soffice_bin-emscripten-exports.mk | 3 +++
desktop/util/Executable_soffice_bin-emscripten-exports | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5c357a4c66990e2ffd4d46d627ee836e7c30fa25
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Feb 12 15:07:37 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Feb 12 16:45:56 2025 +0100
Fix plain LOWA build
...after 364508802571c25ac993e9327c67e2d5c575f668 "Experimental Emscripten
Qt6
--enable-emscripten-proxy-to-pthread ersatz" made it fail with
> em++: error: undefined exported symbol:
"__ZN10emscripten8internal13MethodInvokerINS0_3rvp11default_tagEMN7qstdweb13EventListenerEFvNS_3valEEvPS5_JS6_EE6invokeERKS8_S9_PNS_7_EM_VALE"
[-Wundefined] [-Werror]
when linking Executable_soffice_bin
Change-Id: Ia8089e0b7f6330b42ffcdeba80cc8636bf1ea314
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181492
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/desktop/CustomTarget_soffice_bin-emscripten-exports.mk
b/desktop/CustomTarget_soffice_bin-emscripten-exports.mk
index eec384150801..db729443090a 100644
--- a/desktop/CustomTarget_soffice_bin-emscripten-exports.mk
+++ b/desktop/CustomTarget_soffice_bin-emscripten-exports.mk
@@ -21,5 +21,8 @@
$(gb_CustomTarget_workdir)/desktop/soffice_bin-emscripten-exports/exports: \
# emsdk 3.1.54, comment lines were not supported, so filter them out
here for now:
grep -v '^#'
$(SRCDIR)/desktop/util/Executable_soffice_bin-emscripten-exports >$@
cat $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/exports >>$@
+ifeq
($(ENABLE_QT6)-$(ENABLE_EMSCRIPTEN_JSPI)-$(ENABLE_EMSCRIPTEN_PROXY_TO_PTHREAD),TRUE-TRUE-)
+ printf
'__ZN10emscripten8internal13MethodInvokerINS0_3rvp11default_tagEMN7qstdweb13EventListenerEFvNS_3valEEvPS5_JS6_EE6invokeERKS8_S9_PNS_7_EM_VALE
' >>$@
+endif
# vim: set noet sw=4 ts=4:
diff --git a/desktop/util/Executable_soffice_bin-emscripten-exports
b/desktop/util/Executable_soffice_bin-emscripten-exports
index 7fde7f859828..2206ccccb2d5 100644
--- a/desktop/util/Executable_soffice_bin-emscripten-exports
+++ b/desktop/util/Executable_soffice_bin-emscripten-exports
@@ -12,4 +12,3 @@ _lok_preinit
_lok_preinit_2
_malloc
_free
-__ZN10emscripten8internal13MethodInvokerINS0_3rvp11default_tagEMN7qstdweb13EventListenerEFvNS_3valEEvPS5_JS6_EE6invokeERKS8_S9_PNS_7_EM_VALE
