Patchwork [3/3] cairo: fix build when toolchain has no thread support

login
register
mail settings
Submitter Samuel Martin
Date May 14, 2013, 11:57 a.m.
Message ID <1368532631-12983-3-git-send-email-s.martin49@gmail.com>
Download mbox | patch
Permalink /patch/243688/
State Accepted
Commit 5fa49a6c0f916d0b98cfdc8c09db25982f34f373
Headers show

Comments

Samuel Martin - May 14, 2013, 11:57 a.m.
Fixes the build failure visible at
http://autobuild.buildroot.net/results/d49/d491de5a774592929a59f3bfd0b1fd8cbc089ac0

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/cairo/cairo.mk | 4 ++++
 1 file changed, 4 insertions(+)
Peter Korsgaard - May 14, 2013, 8:06 p.m.
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Fixes the build failure visible at
 Samuel> http://autobuild.buildroot.net/results/d49/d491de5a774592929a59f3bfd0b1fd8cbc089ac0

Committed, thanks.

Patch

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 83c82c0..203dbbe 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -36,6 +36,10 @@  CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no
 
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+	CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"
+endif
+
 CAIRO_CONF_OPT = \
 	--enable-trace=no \
 	--enable-interpreter=no