summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cairo/cairo.inc
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-12 15:58:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 14:26:19 (GMT)
commit3c1701b7c91a7f9366f43eaccce9fdeeedac6c31 (patch)
tree38af35e8d90679b43db90d5e4d686c9738541782 /meta/recipes-graphics/cairo/cairo.inc
parent0a5fe1cdd1f4beb095c4043e136075cf9306cef3 (diff)
downloadpoky-3c1701b7c91a7f9366f43eaccce9fdeeedac6c31.tar.gz
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 <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo/cairo.inc')
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 72aaa03..c983a89 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -10,10 +10,11 @@ HOMEPAGE = "http://cairographics.org"
10BUGTRACKER = "http://bugs.freedesktop.org" 10BUGTRACKER = "http://bugs.freedesktop.org"
11SECTION = "libs" 11SECTION = "libs"
12LICENSE = "MPL-1 & LGPLv2.1" 12LICENSE = "MPL-1 & LGPLv2.1"
13DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0" 13X11DEPENDS = "virtual/libx11 libsm libxrender"
14DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
14 15
15#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 16#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
16require cairo-fpu.inc 17require cairo-fpu.inc
17EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" 18EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
18 19
19inherit autotools pkgconfig 20inherit autotools pkgconfig