RepositoryModule_host.mk | 4 ++--
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 6cbed7b6a8a3ded92020e0dce3c562d867299fe1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Feb 8 10:20:20 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Feb 9 14:23:20 2024 +0100
add chartcore&chartcontroller to mergedlibs
Change-Id: I16b930072d71947acd606a2103e12dea27be3b60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163113
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 0aeae0903c8f..8e94c0518a1d 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 \
+ writerfilter cui \
$(if $(MERGELIBS), merged, \
- oox svx svxcore xo sfx fwk svt vcl) \
+ chartcontroller chartcore 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 be37fe3752fc..2763929de360 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -18,6 +18,8 @@ gb_MERGE_LIBRARY_LIST := \
basegfx \
canvasfactory \
canvastools \
+ chartcontroller \
+ chartcore \
comphelper \
configmgr \
cppcanvas \
