RepositoryExternal.mk | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e096fbc3e06d2c2b55ef8706c954efb6555ca0e6
Author: Stephan Bergmann <[email protected]>
AuthorDate: Tue Mar 7 10:13:25 2023 +0100
Commit: Stephan Bergmann <[email protected]>
CommitDate: Tue Mar 7 18:43:56 2023 +0000
Depend on ExternalPackage_fontconfig, not just ExternalProject_fontconfig
...so that e.g. a from-scratch `make CppunitTest_sw_core_layout` doesn't
fail
with
> warn:sal.osl:3973661:3973661:sal/osl/unx/module.cxx:103:
dlopen(workdir/LinkTarget/Library/libvclbootstrapprotector.so, 257):
libfontconfig-lo.so.1.12.0: cannot open shared object file: No such file or
directory
> Failure instantiating protector
"workdir/LinkTarget/Library/libvclbootstrapprotector.so",
"vclbootstrapprotector"
(This is LINUX-only, as ExternalPackage_fontconfig has been introduced as
LINUX-only by d552b4a549d614a03aa9328e017dec27bd3ff41e "Enable opening of
downloaded fonts only in ForKit in Online": "All this is relevant for Linux
only, as Collabora Online runs on Linux.")
Change-Id: I8976726ee8080f91a0fa97d60b8f345c48cae686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148381
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <[email protected]>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9e8a46fa733e..3ec3cd924395 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1293,7 +1293,11 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo,\
endif
define gb_LinkTarget__use_fontconfig
+ifeq ($(OS),LINUX)
+$(call gb_LinkTarget_use_package,$(1),fontconfig)
+else
$(call gb_LinkTarget_use_external_project,$(1),fontconfig)
+endif
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,fontconfig) \
$$(INCLUDE) \
