RepositoryModule_host.mk | 4 ++--
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ba3d3c308e944978a6b84b81cdcc1fd18f0c713e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 7 12:29:08 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 8 08:08:17 2024 +0100
add oox to --enable-mergelibs
Change-Id: Ic5158faa07538a688fe609cfd1359ec9ce3b6807
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163089
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index b25350ee2c3e..0aeae0903c8f 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -231,9 +231,9 @@ $(eval $(call repositorymodule_serialize,\
$(call gb_Helper_optional,DESKTOP,swui) \
sw sd \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
- writerfilter cui chartcontroller chartcore oox \
+ writerfilter cui chartcontroller chartcore \
$(if $(MERGELIBS), merged, \
- svx svxcore xo sfx fwk svt vcl) \
+ oox svx svxcore xo sfx fwk svt vcl) \
))
endif
endif # !$(DISABLE_DYNLOADING)
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 44b9bbc47688..be37fe3752fc 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -61,6 +61,7 @@ gb_MERGE_LIBRARY_LIST := \
odfflatxml \
offacc \
$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
+ oox \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
package2 \
passwordcontainer \
