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

[Noel Grandin (via logerrit)]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit b8077713987253f6db0887ddad56fd6871374a8b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 2 20:14:19 2020 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Mar 3 08:24:09 2020 +0100

    Revert "add some libs to libmerged"
    
    This reverts commit 4ec76bdeeb000881cf46c78166dc02badb4f44db.
    
    Revert this for now to get the TB77 builds working again.
    
    Change-Id: I345ad54b5bc8e8a06dfba539c2cee8822a350f93
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89802
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 976de14e8967..9cb91a5d4a15 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -83,24 +83,13 @@ MERGE_LIBRARY_LIST := \
 	svx \
 	svxcore \
 	syssh \
-	textfd \
 	tk \
 	tl \
 	ucb1 \
 	ucbhelper \
 	ucpexpand1 \
-	ucpext \
-	ucphier1 \
-	ucpimage \
 	ucpfile1 \
-	ucptdoc1 \
-	unordf \
 	unoxml \
-	$(if $(ENABLE_ONLINE_UPDATE), \
-		updatecheckui \
-        updchk \
-	) \
-	updatefeed \
 	utl \
 	uui \
 	vcl \