external/cairo/ExternalProject_cairo.mk | 2 +- external/cairo/UnpackedTarball_cairo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit edc6033e39fb8695e1381503a195078b4a431d60 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Aug 26 20:41:49 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Sep 22 12:46:03 2025 +0200 don't require pkg-config on macOS either Change-Id: Icaca4f047060c73dee9562385fb3d5e3f6b99cd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191316 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 40e249b51a2c..53536cea2f00 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,cairo) $(ZLIB_CFLAGS)" \ LDFLAGS="$(call gb_ExternalProject_get_link_flags,cairo)" \ ) \ - $(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ + $(if $(filter MACOSX ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ LIBS="$(ZLIB_LIBS)" \ $(if $(filter -fsanitize=%,$(LDFLAGS)),LDFLAGS="$(LDFLAGS) -fuse-ld=bfd") \ pixman_CFLAGS="-I$(gb_UnpackedTarball_workdir)/pixman/pixman -pthread" \ diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index a4dff6c9b9d5..ece81d1341dd 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -49,7 +49,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ )) endif -ifneq (,$(filter ANDROID iOS,$(OS))) +ifneq (,$(filter MACOSX ANDROID iOS,$(OS))) $(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config)) endif
