core.git: RepositoryModule_host.mk solenv/gbuild

[Noel Grandin (via logerrit)]

 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 
AuthorDate: Thu Feb 8 10:20:20 2024 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 9 14:23:20 2024 +0100

add chartcore to mergedlibs

Change-Id: I16b930072d71947acd606a2103e12dea27be3b60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163113
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

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 \

core.git: RepositoryModule_host.mk solenv/gbuild

[Noel Grandin (via logerrit)]

 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 
AuthorDate: Wed Feb 7 12:29:08 2024 +0200
Commit: Noel Grandin 
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 

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 \

[Libreoffice-commits] core.git: RepositoryModule_host.mk solenv/gbuild

[Caolán McNamara]

 RepositoryModule_host.mk   |2 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9d7315df825762ef03f47c56dd078d7b1724f1cf
Author: Caolán McNamara 
Date:   Mon Dec 19 11:54:37 2016 +

lets always have at least dbtools

Change-Id: I72f768ad760fd9fa1e3ec988e5217672bca9c824
Reviewed-on: https://gerrit.libreoffice.org/32175
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 2a174e5..c6c0f3d 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,DESKTOP,codemaker) \
comphelper \
configmgr \
-   $(call gb_Helper_optional,DBCONNECTIVITY,connectivity) \
+   connectivity \
cppcanvas \
cppu \
cppuhelper \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b946060b..481032c 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -16,7 +16,7 @@ MERGE_LIBRARY_LIST := \
configmgr \
cppcanvas \
$(call gb_Helper_optional,BREAKPAD,crashreport) \
-   $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
+   dbtools \
deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits