desktop/Library_sofficeapp.mk | 3 ++-
lingucomponent/Module_lingucomponent.mk | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 93741a53562a78ca626e9c1fce15004c07d901e3
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Thu Jan 4 10:13:47 2024 +0100
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Fri Jan 5 09:22:59 2024 +0100
Fix Fix --disable-curl build for wasm
cherry-picked (partly) from: 5bf7c2fa57946cc3323a1d4ee1b2f31d805ae06f
(Fix --disable-curl build)
Change-Id: Ie0429b086d9b89d4a0c3b7b86afba08c3e831c2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161609
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 70f4b07ea045..f27372cbddc6 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -24,9 +24,10 @@ $(eval $(call gb_Library_use_externals,sofficeapp, \
icu_headers \
icui18n \
icuuc \
+ $(if $(ENABLE_CURL), \
$(if $(filter-out EMSCRIPTEN iOS,$(OS)), \
curl \
- )\
+ ))\
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
orcus-parser \
orcus )\
diff --git a/lingucomponent/Module_lingucomponent.mk
b/lingucomponent/Module_lingucomponent.mk
index 13f1a829d98a..8cbd2ab19fa9 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -25,10 +25,16 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\
))
endif
+ifeq ($(ENABLE_CURL),TRUE)
$(eval $(call gb_Module_add_targets,lingucomponent,\
$(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
- Library_numbertext \
Library_LanguageTool \
))
+endif
+
+$(eval $(call gb_Module_add_targets,lingucomponent,\
+ $(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
+ Library_numbertext \
+))
# vim: set noet sw=4 ts=4:
