From dff1d7526f8b9d98c864a32654820cf92196ccbf Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Thu, 10 Nov 2022 00:32:10 +0100 Subject: [PATCH] Don't use pthread for cairo For cross builds, odd cases of cairo configure picking up wrong librt and then missing pthread functions - so lets just disable it, we're not using cairo multi-threaded anyway. Change-Id: Id8b6426203859e7bf082d71ad8cf4548928d6acc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143390 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- external/cairo/ExternalProject_cairo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 53a51b5e45ea..fd934906343b 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(gb_RUN_CONFIGURE) ./configure \ $(if $(debug),STRIP=" ") \ $(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \ - $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=" $(ZLIB_CFLAGS) -Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" --enable-pthread=yes PTHREAD_LIBS="") \ + $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=-DCAIRO_NO_MUTEX" $(ZLIB_CFLAGS) -Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" ) \ $(if $(filter-out EMSCRIPTEN ANDROID iOS,$(OS)), \ CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,cairo) $(ZLIB_CFLAGS)" \ LDFLAGS="$(call gb_ExternalProject_get_link_flags,cairo)" \