From d7e5d19e4617e41765db758778503501bfa8fdcf Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Sun, 25 Apr 2021 16:02:10 +0200 Subject: [PATCH] WASM: add distro config, amend readme Let's move common configury to distro config, so people get necessary changes across updates w/o manual intervention. Change-Id: Ic27db86e7681bcef0632ed6b5fdd2fe8df0fdba3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114629 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- README.wasm | 46 +++++++-------------------- distro-configs/LibreOfficeWASM32.conf | 31 ++++++++++++++++++ 2 files changed, 43 insertions(+), 34 deletions(-) create mode 100644 distro-configs/LibreOfficeWASM32.conf diff --git a/README.wasm b/README.wasm index 53774549a46c..a09d4d61762c 100644 --- a/README.wasm +++ b/README.wasm @@ -74,43 +74,21 @@ autogen.sh is patched to use emconfigure. That basically sets various environmen especially EMMAKEN_JUST_CONFIGURE, which will create the correct output file names, checked by configure (a.out). +There's a distro config for WASM (work in progress), that gets your +defaults right (and currently disables a ton of 3rd party stuff which +is not essential). + +Recommended configure setup is thusly: + +# grab defaults +--with-distro=LibreOfficeWASM32 + +# local config QT5DIR=/dir/of/git_qt5/qtbase ---host=wasm64-local-emscripten ---disable-coinmp ---disable-cups ---disable-dbus ---disable-dconf ---disable-dynamic-loading ---disable-extension-integration ---disable-extensions ---disable-extension-update ---disable-firebird-sdbc ---disable-gio ---disable-gstreamer-1-0 ---disable-ldap ---disable-lpsolve ---disable-mariadb-sdbc ---disable-nss ---disable-odk ---disable-online-update ---disable-opencl ---disable-pdfimport ---disable-postgresql-sdbc ---disable-python ---disable-randr ---disable-report-builder ---disable-scripting ---disable-sdremote-bluetooth +# if you want to use ccache on both sides of the build +--with-build-platform-configure-options=--enable-ccache --enable-ccache ---without-helppack-integration ---without-java ---without-junit ---without-system-dicts ---with-fonts ---with-theme=no - -Many will also be encoded in configure.ac at some point, some already is. == Using Docker to cross-build with emscripten == diff --git a/distro-configs/LibreOfficeWASM32.conf b/distro-configs/LibreOfficeWASM32.conf new file mode 100644 index 000000000000..b07419ba2e21 --- /dev/null +++ b/distro-configs/LibreOfficeWASM32.conf @@ -0,0 +1,31 @@ +--host=wasm32-local-emscripten +--disable-coinmp +--disable-cups +--disable-dbus +--disable-dconf +--disable-dynamic-loading +--disable-extension-integration +--disable-extensions +--disable-extension-update +--disable-firebird-sdbc +--disable-gio +--disable-gstreamer-1-0 +--disable-ldap +--disable-lpsolve +--disable-mariadb-sdbc +--disable-nss +--disable-odk +--disable-online-update +--disable-opencl +--disable-pdfimport +--disable-postgresql-sdbc +--disable-python +--disable-randr +--disable-report-builder +--disable-scripting +--disable-sdremote-bluetooth +--without-helppack-integration +--without-java +--without-junit +--without-system-dicts +--with-theme=no