From 3c1701b7c91a7f9366f43eaccce9fdeeedac6c31 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 12 Aug 2011 16:58:32 +0100 Subject: cairo: only use x11 if selected in DISTRO_FEATURES This makes it possible to build cairo-using apps without X11. (From OE-Core rev: ba22cfac56120d001a53d33aee3b8eb3feda2786) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/cairo/cairo.inc') diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 72aaa03620..c983a89af0 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -10,10 +10,11 @@ HOMEPAGE = "http://cairographics.org" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" LICENSE = "MPL-1 & LGPLv2.1" -DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0" +X11DEPENDS = "virtual/libx11 libsm libxrender" +DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf