[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - external/fontconfig

[Tor Lillqvist (via logerrit)]

 external/fontconfig/ExternalProject_fontconfig.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05ae7910448a46aa7bb5698244db83d86ed9f1f9
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Dec 14 21:50:09 2022 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Feb 24 07:56:25 2023 +0000

    Need to mention libxml2 here, too, when building for Emscripten
    
    Forgot this in 563c28b6508ac836fbe46369a4d2d300cda650cf.
    
    Change-Id: I8675273c461f1b83b4dbe8bb7f9f58130a1d77fb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144200
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147561
    Tested-by: Tor Lillqvist <t...@collabora.com>

diff --git a/external/fontconfig/ExternalProject_fontconfig.mk 
b/external/fontconfig/ExternalProject_fontconfig.mk
index ed01c04aaf2f..3bbecf1d672a 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
 
 $(eval $(call gb_ExternalProject_use_externals,fontconfig,\
-       expat \
+       $(if $(filter EMSCRIPTEN,$(OS)),libxml2,expat) \
        freetype \
 ))