Patchwork cairo: disable trace and trace interpreter

login
register
mail settings
Submitter Thomas Petazzoni
Date Oct. 14, 2012, 10:28 a.m.
Message ID <1350210517-24759-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/191340/
State Accepted
Commit 85280ef82936257456449f189d2ea4b484a8f269
Headers show

Comments

Thomas Petazzoni - Oct. 14, 2012, 10:28 a.m.
The Cairo tracing and trace interpreter are most likely not that
useful, so disable them. They also require zlib, which isn't a
dependency of Cairo at the moment. This fixes the following build
failure:

  http://autobuild.buildroot.org/results/a91e4e337fd9deb0f9fad433350feb27b2aee556/build-end.log

In the future, if people are interested by the trace and trace
interpreter, we can add a new Config.in knob for them.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cairo/cairo.mk |    4 ++++
 1 file changed, 4 insertions(+)
Peter Korsgaard - Oct. 14, 2012, 6:18 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The Cairo tracing and trace interpreter are most likely not that
 Thomas> useful, so disable them. They also require zlib, which isn't a
 Thomas> dependency of Cairo at the moment. This fixes the following build
 Thomas> failure:

 Thomas>   http://autobuild.buildroot.org/results/a91e4e337fd9deb0f9fad433350feb27b2aee556/build-end.log

 Thomas> In the future, if people are interested by the trace and trace
 Thomas> interpreter, we can add a new Config.in knob for them.

Committed, thanks.

Patch

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index eedb28d..2a453bb 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -34,6 +34,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
 
+CAIRO_CONF_OPT = \
+	--enable-trace=no \
+	--enable-interpreter=no
+
 CAIRO_DEPENDENCIES = host-pkg-config fontconfig pixman
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)