summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2021-04-18 19:10:20 +0200
committerCaolán McNamara <caolanm@redhat.com>2021-04-19 16:26:56 +0200
commitc656b1048f0efbbe36c78de357dd03845c38177c (patch)
treee5875960a384f7642f4ff631c1d122e3561237b5
parentColibre: Revise some icons (diff)
downloadcore-c656b1048f0efbbe36c78de357dd03845c38177c.tar.gz
core-c656b1048f0efbbe36c78de357dd03845c38177c.zip
tdf#132901: do not add updatecheck to libmerged
LibreOffice crashes if "online update" feature is not installed Regression from c63148ba139bd6b9ae7a0f9e24e51f29e5370963 < Revert "Revert "add some libs to libmerged"" > Change-Id: Ia18f50bc6baf830b2d3e0814645ef04283bfaa04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114247 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 6064446f828f8cd612f7d6660153b2eb1139239b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114272 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 976de14e8967..5d0989142675 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -96,10 +96,6 @@ MERGE_LIBRARY_LIST := \
ucptdoc1 \
unordf \
unoxml \
- $(if $(ENABLE_ONLINE_UPDATE), \
- updatecheckui \
- updchk \
- ) \
updatefeed \
utl \
uui \