diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 13:45:05 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:14:54 +0200 |
| commit | 8a4173987edfeeb7e49c70617d43e3adc911d333 (patch) | |
| tree | 24360e0c3fe2b2138f9a291f143f9a6667c53510 /external/boost | |
| parent | Switch OPENSSL config var from negative to positive (diff) | |
| download | core-8a4173987edfeeb7e49c70617d43e3adc911d333.tar.gz core-8a4173987edfeeb7e49c70617d43e3adc911d333.zip | |
WASM: add initial support for Emscripten cross build
- configure with:
- --host=wasm64-local-emscripten
- had to make a few externals optional, so adding:
- --disable-nss
- --disable-cmis
- --disable-curl
Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost-emscripten-noshm.patch.0 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index bdacdcd9856e..c10ed5a55048 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3)) $(eval $(call gb_UnpackedTarball_add_patches,boost,\ $(foreach patch,$(boost_patches),external/boost/$(patch)) \ + external/boost/boost-emscripten-noshm.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/boost/boost-emscripten-noshm.patch.0 b/external/boost/boost-emscripten-noshm.patch.0 new file mode 100644 index 000000000000..f9d27b0b6e11 --- /dev/null +++ b/external/boost/boost-emscripten-noshm.patch.0 @@ -0,0 +1,11 @@ +--- boost/interprocess/detail/workaround.hpp.orig 2020-12-15 06:31:51.037665526 +0100 ++++ boost/interprocess/detail/workaround.hpp 2020-12-15 06:32:39.741281893 +0100 +@@ -31,7 +31,7 @@ + ////////////////////////////////////////////////////// + //Check for XSI shared memory objects. They are available in nearly all UNIX platforms + ////////////////////////////////////////////////////// +- #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(__VXWORKS__) ++ #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__) && !(__VXWORKS__) && !defined(__EMSCRIPTEN__) + #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS + #endif + |