strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WASM boost: fix build with Emscripten

Browse source 
boost probably expects a WASI, not Emscripten.

Change-Id: I7f275e1b501d6ea46d43637be815bf5a45b1cc40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128586
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2022-01-09 01:26:25 +01:00
parent ad5563b4f2
commit e76c7cf178
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
external/boost/UnpackedTarball_boost.mk vendored
View file

@ -44,6 +44,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 \
external/boost/boost-emscripten-nowasm.patch.0 \
))
# vim: set noet sw=4 ts=4:

11
external/boost/boost-emscripten-nowasm.patch.0 vendored Normal file
View file

@ -0,0 +1,11 @@
--- boost/config/detail/select_platform_config.hpp.orig 2021-11-13 18:32:09.446182220 +0100
+++ boost/config/detail/select_platform_config.hpp 2021-11-13 18:32:57.734041110 +0100
@@ -89,7 +89,7 @@
// Nuxi CloudABI:
# define BOOST_PLATFORM_CONFIG "boost/config/platform/cloudabi.hpp"
-#elif defined (__wasm__)
+#elif defined (__wasm__) && !defined (__EMSCRIPTEN__)
// Web assembly:
# define BOOST_PLATFORM_CONFIG "boost/config/platform/wasm.hpp"