configure.ac | 2 +-
external/cairo/ExternalProject_cairo.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8aef8c3a1451b2fce37a21870a004855822ee335
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Nov 23 15:48:27 2022 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Nov 29 01:56:02 2022 +0100
Make it possible to run either Writer or Calc in the same Emscripten thing
If no --with-main-module option is used, don't strip either.
To switch, you need to edit the instdir/program/soffice.js . (Or
static/emscripten/soffice_args.js and re-make.)
Change-Id: I572a777134e7b29fc4896e7b094ceca521874ae1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143396
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 0d0ccebda32a..bea2bd98a22e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3937,7 +3937,7 @@ if test "$cross_compiling" = "yes"; then
if test "$_os" = "Emscripten"; then
if test "$with_main_module" = "calc"; then
ENABLE_WASM_STRIP_WRITER=TRUE
- else
+ elif test "$with_main_module" = "writer"; then
ENABLE_WASM_STRIP_CALC=TRUE
fi
fi
commit dff1d7526f8b9d98c864a32654820cf92196ccbf
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Thu Nov 10 00:32:10 2022 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Nov 29 01:55:50 2022 +0100
Don't use pthread for cairo
For cross builds, odd cases of cairo configure picking up wrong librt
and then missing pthread functions - so lets just disable it, we're
not using cairo multi-threaded anyway.
Change-Id: Id8b6426203859e7bf082d71ad8cf4548928d6acc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143390
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/external/cairo/ExternalProject_cairo.mk
b/external/cairo/ExternalProject_cairo.mk
index 53a51b5e45ea..fd934906343b 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(gb_RUN_CONFIGURE) ./configure \
$(if $(debug),STRIP=" ") \
$(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g)
$(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \
- $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=" $(ZLIB_CFLAGS)
-Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" --enable-pthread=yes
PTHREAD_LIBS="") \
+ $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=-DCAIRO_NO_MUTEX"
$(ZLIB_CFLAGS) -Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" ) \
$(if $(filter-out EMSCRIPTEN ANDROID iOS,$(OS)), \
CFLAGS="$(CFLAGS) $(call
gb_ExternalProject_get_build_flags,cairo) $(ZLIB_CFLAGS)" \
LDFLAGS="$(call
gb_ExternalProject_get_link_flags,cairo)" \
