external/cairo/ExternalProject_cairo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 3653d07311e1572379b2691d39ec41383b21dd72 Author: Thorsten Behrens <[email protected]> AuthorDate: Thu Nov 10 00:32:10 2022 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Nov 10 00:32:10 2022 +0100 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 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)" \
