external/cairo/ExternalPackage_cairo.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 9eaa1325a014ff76acd3290752f842ed6bad89ac
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Feb 13 15:52:53 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Feb 13 15:49:21 2023 +0000
Only package the external/cairo library that is named the same as the SONAME
Change-Id: Id97fe380c3e3976e56a6962eaebfbd696bab7332
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146908
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/cairo/ExternalPackage_cairo.mk
b/external/cairo/ExternalPackage_cairo.mk
index 74a46688406a..6bd0800d9f21 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -12,8 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
ifneq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2.1170$(CAIRO_VERSION_MICRO).0,src/.libs/libcairo-lo.so.2.1170$(CAIRO_VERSION_MICRO).0))
-$(eval $(call
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2,src/.libs/libcairo-lo.so.2))
+$(eval $(call
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo-lo.so.2,src/.libs/libcairo-lo.so.2.1170$(CAIRO_VERSION_MICRO).0))
endif
# vim: set noet sw=4 ts=4:
