external/cairo/ExternalProject_cairo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit ccbd3926bd04414249feae58b34ec405382b999d Author: Caolán McNamara <[email protected]> AuthorDate: Thu Oct 9 20:54:40 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Oct 10 10:00:17 2025 +0200 tweak cairo libxml requirements for all things that use internal libxml2 to fix oss-fuzz build too Change-Id: I1fe9bc878081530ba6b9455a46196a6afd91f3f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192136 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index a1053d29cbd9..bc39387aad7a 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,cairo,\ libpng \ meson \ zlib \ - $(if $(filter EMSCRIPTEN,$(OS)),libxml2) \ + libxml2 \ )) # We cannot use environment vars inside the meson cross-build file, @@ -93,7 +93,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ) \ $(if $(SYSTEM_ZLIB),,PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:$(gb_UnpackedTarball_workdir)/zlib") \ $(if $(SYSTEM_LIBPNG),,PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:$(gb_UnpackedTarball_workdir)/libpng") \ - $(if $(filter EMSCRIPTEN,$(OS)),PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:$(gb_UnpackedTarball_workdir)/libxml2") \ + $(if $(SYSTEM_LIBXML),,PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:$(gb_UnpackedTarball_workdir)/libxml2") \ $(if $(filter -fsanitize=undefined,$(CC)),CC='$(CC) -fno-sanitize=function') \ $(MESON) setup --wrap-mode nofallback builddir \ $(if $(debug),-Dstrip=false,-Dstrip=true) \
