[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild static/emscripten

2023-01-16 Thread Balazs Varga (via logerrit) 
 solenv/gbuild/CppunitTest.mk   |1 
 solenv/gbuild/Executable.mk|1 
 solenv/gbuild/LinkTarget.mk|   10 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |5 
 solenv/gbuild/platform/unxgcc.mk   |1 
 static/emscripten/soffice.html | 5941 +
 static/emscripten/soffice_args.js  |4 
 7 files changed, 5961 insertions(+), 2 deletions(-)

New commits:
commit 69286705a247a708f6aba55086d05ea3c517e5a4
Author: Balazs Varga 
AuthorDate: Mon Jan 16 11:10:00 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jan 16 13:45:49 2023 +0100

WASM: headless conversion without QT5 and with unique html

Building and using soffice.html generated by emscripten and modified for
headless conversion.

Change-Id: Ic3800bc0632d241dce382f244f355f56f79ffec4

Conflicts:
include/sfx2/objsh.hxx
sfx2/source/doc/objstor.cxx
solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
static/emscripten/soffice_args.js
sfx2/source/doc/objstor.cxx

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 6ed65e40e608..7138eb123327 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -523,5 +523,6 @@ gb_CppunitTest_use_clang = $(call 
gb_CppunitTest__forward_to_Linktarget,$(0),$(1
 gb_CppunitTest_set_clang_precompiled_header = $(call 
gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_CppunitTest_use_vclmain = $(call 
gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_CppunitTest_add_prejs = $(call 
gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_CppunitTest_add_shellhtml = $(call 
gb_CppunitTest__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 7c8cf199496d..57fe1525570c 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -159,6 +159,7 @@ gb_Executable_use_clang = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),
 gb_Executable_set_clang_precompiled_header = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_use_vclmain = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_prejs = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Executable_add_shellhtml = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 
 # Run-time use
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9bf4cacf2b8a..0029f20125f9 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1059,6 +1059,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_CXX :=
 $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(USE_LD)
 $(call gb_LinkTarget_get_target,$(1)) : T_LTOFLAGS := $(gb_LTOFLAGS)
 $(call gb_LinkTarget_get_target,$(1)) : T_PREJS :=
+$(call gb_LinkTarget_get_target,$(1)) : T_SHELLHTML :=
 
 ifeq ($(gb_FULLDEPS),$(true))
 ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD))
@@ -2259,4 +2260,13 @@ endif
 
 endef
 
+# call gb_LinkTarget_add_prejs,linktarget,js_file
+define gb_LinkTarget_add_shellhtml
+ifeq (EMSCRIPTEN,$(OS))
+$(call gb_LinkTarget_get_target,$(1)) : T_SHELLHTML += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : $(2)
+endif
+
+endef
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 4e4e171a52ee..8a8c115448a5 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -16,6 +16,9 @@ gb_EMSCRIPTEN_PRE_JS_FILES = \
 $(SRCDIR)/static/emscripten/environment.js \
 $(call 
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link \
 
+gb_EMSCRIPTEN_SHELL_HTML_FILE = \
+$(SRCDIR)/static/emscripten/soffice.html \
+
 gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure
 # avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps
 gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1 -D_LARGEFILE64_SOURCE 
-D_LARGEFILE_SOURCE
@@ -75,6 +78,7 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 )
 
 $(foreach pre_js,$(gb_EMSCRIPTEN_PRE_JS_FILES),$(call 
gb_Executable_add_prejs,$(1),$(pre_js)))
+$(foreach shell_html,$(gb_EMSCRIPTEN_SHELL_HTML_FILE),$(call 
gb_Executable_add_shellhtml,$(1),$(shell_html)))
 
 endef
 
@@ -87,6 +91,7 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 )
 
 $(foreach pre_js,$(gb_EMSCRIPTEN_PRE_JS_FILES),$(call 
gb_CppunitTest_add_prejs,$(1),$(pre_js)))
+$(foreach shell_html,$(gb_EMSCRIPTEN_SHELL_HTML_FILE),$(call 
gb_CppunitTest_add_shellhtml,$(1),$(shell_html)))
 
 endef
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d950f8dbd444..7da5b1236d30 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -143,6 +143,7 @@

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2022-11-08 Thread Michael Stahl (via logerrit) 
 solenv/gbuild/platform/com_GCC_defs.mk |3 ++-
 solenv/gbuild/platform/unxgcc.mk   |2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1aa6a576bc6aa219fa607df6a65ded6b978efa71
Author: Michael Stahl 
AuthorDate: Tue Nov 8 15:18:40 2022 +0100
Commit: Michael Stahl 
CommitDate: Tue Nov 8 15:18:40 2022 +0100

WASM gbuild: avoid annoying python warnings from emscripten

/home/builder/emsdk/upstream/emscripten/tools/building.py:1228: 
ResourceWarning: unclosed file <_io.BufferedReader 
name='/data/lo/build_feature_wasm/workdir/LinkTarget/StaticLibrary/libdtoa.a'>
  header = open(filename, 'rb').read(8)
ResourceWarning: Enable tracemalloc to get the object allocation traceback

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 443ff10eaae1..064e542adc88 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -278,7 +278,8 @@ ifeq ($(COMPILER_PLUGINS_DEBUG),TRUE)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang --debug
 endif
 # set CCACHE_CPP2=1 to prevent clang generating spurious warnings
-gb_COMPILER_SETUP += CCACHE_CPP2=1
+# clear PYTHONWARNINGS to prevent noise from emscripten implementation
+gb_COMPILER_SETUP += CCACHE_CPP2=1 $(if $(filter 
EMSCRIPTEN,$(OS)),PYTHONWARNINGS=default)
 gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
SCCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
 -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b066cdfcba16..b0612aca4e4d 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -134,6 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \
$(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ;  \
echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date 
-u),$(true),LNK,5)" ; \
 )
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
 $(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) 
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
@@ -186,6 +187,7 @@ endef
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
+   $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \
$(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild static/CustomTarget_wasm_fs_image.mk

2022-01-10 Thread Jan-Marek Glogowski (via logerrit) 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 static/CustomTarget_wasm_fs_image.mk   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7de4df3014379bd92124a21cfed4b5af537b7ebc
Author: Jan-Marek Glogowski 
AuthorDate: Mon Jan 10 14:01:04 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jan 10 14:01:04 2022 +0100

fixup

Change-Id: Ia54820b23582bc9bbf50abe851dee8b2cd616206

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 34909ad5451e..630e6f550564 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -22,7 +22,7 @@ gb_EMSCRIPTEN_CPPFLAGS := -pthread -s USE_PTHREADS=1
 gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS)
 
 # Initial memory size and worker thread pool
-gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=512MB -s PTHREAD_POOL_SIZE=4
+gb_EMSCRIPTEN_LDFLAGS += -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=4
 
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscrypten.py, finalize_wasm, modify_wasm = True
diff --git a/static/CustomTarget_wasm_fs_image.mk 
b/static/CustomTarget_wasm_fs_image.mk
index e88d5f422a63..1444e17c79ff 100644
--- a/static/CustomTarget_wasm_fs_image.mk
+++ b/static/CustomTarget_wasm_fs_image.mk
@@ -1238,7 +1238,7 @@ ifeq ($(WITH_FONTS),TRUE)
 gb_wasm_fs_image_autoinstall += $(call gb_AutoInstall_get_target,ooo_fonts)
 endif
 
-gb_wasm_fs_image_filelists += $(call 
gb_ExternalPackage_get_target,liblangtag_data)
+gb_wasm_fs_image_filelists += $(call gb_Package_get_target,liblangtag_data)
 gb_wasm_fs_image_filelists += $(call gb_Package_get_target,fontconfig_data)
 
 #

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2021-10-03 Thread Jan-Marek Glogowski (via logerrit) 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fe2872734c8854dac8e9cda1adb859583b853a52
Author: Jan-Marek Glogowski 
AuthorDate: Sun Oct 3 20:41:33 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Sun Oct 3 20:41:33 2021 +0200

fixup js, 2.

Change-Id: Ic3fa2ee92b2a36a14cbde9cc2b59ed8babae3171

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 8f846b0db2c4..562ed18cf867 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -63,7 +63,7 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.worker.js,$(3)) \
 )
 
-$(call gb_Executable_get_linktarget,$(2)) : $(gb_EMSCRIPTEN_PRE_JS_FILES)
+$(call gb_LinkTarget_get_target,$(2)) : $(gb_EMSCRIPTEN_PRE_JS_FILES)
 
 endef
 
@@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.worker.js,$(3)) \
 )
 
-$(call gb_CppunitTest_get_linktarget,$(2)) : $(gb_EMSCRIPTEN_PRE_JS_FILES)
+$(call gb_LinkTarget_get_target,$(2)) : $(gb_EMSCRIPTEN_PRE_JS_FILES)
 
 endef

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2021-10-03 Thread Jan-Marek Glogowski (via logerrit) 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1facc67e68f0b22f14b2475e711453a93d0e971
Author: Jan-Marek Glogowski 
AuthorDate: Sun Oct 3 20:29:59 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Sun Oct 3 20:29:59 2021 +0200

fixup js

Change-Id: I348468cbf07f1cc3107c041609c2ce178a9c4bb0

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 1ad437ef2f55..8f846b0db2c4 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -63,7 +63,7 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.worker.js,$(3)) \
 )
 
-$(call gb_Executable_get_linktarget,$(2)) : $(gb_EMSCRIPTEN_PRE_JS)
+$(call gb_Executable_get_linktarget,$(2)) : $(gb_EMSCRIPTEN_PRE_JS_FILES)
 
 endef
 
@@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(patsubst %.lib,%.worker.js,$(3)) \
 )
 
-$(call gb_CppunitTest_get_linktarget,$(2)) : $(gb_EMSCRIPTEN_PRE_JS)
+$(call gb_CppunitTest_get_linktarget,$(2)) : $(gb_EMSCRIPTEN_PRE_JS_FILES)
 
 endef

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2021-08-01 Thread Thorsten Behrens (via logerrit) 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a28400ce3329ee2608054aafc99c5d78718cbf07
Author: Thorsten Behrens 
AuthorDate: Sun Aug 1 19:56:35 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Sun Aug 1 19:56:35 2021 +0200

Fix -Wdeprecated warning

Change-Id: Ibd28f4c6ee39d395c37bd0cdb713942de92fe54c

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 326fdd78f5ec..36814b9b87da 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -17,7 +17,7 @@ gb_EMSCRIPTEN_CPPFLAGS := -pthread -s TOTAL_MEMORY=1GB -s 
USE_PTHREADS=1 -s PTHR
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscrypten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s 
FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 
-s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"] --pre-js 
$(call gb_CustomTarget_get_workdir,static/wasm_fs_image)/soffice.data.js.link 
--pre-js $(SRCDIR)/static/environment.js
+gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s 
FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 
-s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"] --pre-js $(call 
gb_CustomTarget_get_workdir,static/wasm_fs_image)/soffice.data.js.link --pre-js 
$(SRCDIR)/static/environment.js
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG 
-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 gb_Executable_EXT := .html

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2021-07-20 Thread Thorsten Behrens (via logerrit) 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2da19a3f9dd6c74532567823d3caca73f205fd1c
Author: Thorsten Behrens 
AuthorDate: Tue Jul 20 22:25:28 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jul 20 22:25:28 2021 +0200

Use proper absolute paths on linker lines

Change-Id: Ic09d2074144ebc58142f55a105d22540561628df

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index e8b090516633..2eb8e6be197a 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -17,7 +17,7 @@ gb_EMSCRIPTEN_CPPFLAGS := -pthread -s TOTAL_MEMORY=1GB -s 
USE_PTHREADS=1 -s PTHR
 # To keep the link time (and memory) down, prevent all rewriting options from 
wasm-emscripten-finalize
 # See emscrypten.py, finalize_wasm, modify_wasm = True
 # So we need WASM_BIGINT=1 and ASSERTIONS=1 (2 implies STACK_OVERFLOW_CHECK)
-gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s 
FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 
-s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"] --pre-js 
instdir/program/soffice.data.js --pre-js static/debug.js
+gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s 
FORCE_FILESYSTEM=1 -s WASM_BIGINT=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 
-s ASSERTIONS=1 -s EXIT_RUNTIME=0 -s 
EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"] --pre-js 
$(INSTDIR)/program/soffice.data.js --pre-js $(SRCDIR)/static/debug.js
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG 
-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
 gb_Executable_EXT := .html
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2021-05-22 Thread Thorsten Behrens (via logerrit) 
 solenv/gbuild/platform/linux.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4fa1ad6869f01f2f7eab3482803b39ef424cb482
Author: Thorsten Behrens 
AuthorDate: Sat May 22 14:20:59 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Sat May 22 14:20:59 2021 +0200

Fix linking for clang build

Change-Id: I593ab41a4602cedb6586e428773ed41d7e21f1f4

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 823190490589..3238ce7a47ba 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -20,7 +20,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 gb_STDLIBS :=
 
 ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_STDLIBS += -ldl -lm
+gb_STDLIBS += -ldl -lm -pthread -lpthread
 endif
 
 gb_STDLIBS_CXX :=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/wasm' - solenv/gbuild

2021-01-24 Thread Thorsten Behrens (via logerrit) 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f7948f272660cc789a0e68ff69156aba536c5215
Author: Thorsten Behrens 
AuthorDate: Sun Jan 24 23:54:02 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Sun Jan 24 23:54:02 2021 +0100

Get debug builds working

- source maps really don't like SAFE_HEAP=1
  (c.f. https://github.com/emscripten-core/emscripten/issues/8584)
- get OptFlags passed on consistently while at it

Change-Id: I7d234de6b069877a558a2f3c7ab9dd5398d18ef2

diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index b0e26432f173..a3c52e782554 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -12,7 +12,8 @@ gb_UnoApiHeadersTarget_select_variant = $(if $(filter 
udkapi,$(1)),comprehensive
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_RUN_CONFIGURE := $(SRCDIR)/solenv/bin/run-configure
-gb_EMSCRIPTEN_CPPFLAGS := -pthread -s TOTAL_MEMORY=1GB -s USE_PTHREADS=1 -s 
PTHREAD_POOL_SIZE=4 -s SAFE_HEAP=1
+# avoid -s SAFE_HEAP=1 - c.f. gh#8584 this breaks source maps
+gb_EMSCRIPTEN_CPPFLAGS := -pthread -s TOTAL_MEMORY=1GB -s USE_PTHREADS=1 -s 
PTHREAD_POOL_SIZE=4
 gb_EMSCRIPTEN_LDFLAGS := $(gb_EMSCRIPTEN_CPPFLAGS) --bind -s 
ERROR_ON_UNDEFINED_SYMBOLS=1 -s FETCH=1 -s ASSERTIONS=2 -s EXIT_RUNTIME=1 -s 
EXTRA_EXPORTED_RUNTIME_METHODS=["UTF16ToString","stringToUTF16"]
 gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST -DQT_NO_JAVA_STYLE_ITERATORS 
-DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG 
-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 
@@ -25,7 +26,10 @@ gb_LinkTarget_CXXFLAGS += $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_QTDEFS) $(gb
 # WASM is also optimized at link time, but ignores linker flags, so wants 
$(gb_COMPILEROPTFLAGS)
 gb_LINKEROPTFLAGS :=
 gb_LINKERSTRIPDEBUGFLAGS :=
-gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) 
$(gb_EMSCRIPTEN_EXCEPT) \
+  $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS), \
+  $(if $(ENABLE_OPTIMIZED_DEBUG),$(gb_COMPILERDEBUGOPTFLAGS), \
+  $(gb_COMPILERNOOPTFLAGS)))
 
 define gb_Library_get_rpath
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits