diff options
| author | Phil Blundell <philb@gnu.org> | 2011-08-12 16:58:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-15 15:13:34 +0100 |
| commit | ba22cfac56120d001a53d33aee3b8eb3feda2786 (patch) | |
| tree | b53b7487218022eb505e8e1fa016d941506c76f7 | |
| parent | 2f94ff4fdb66755ba2448794baea19315ff96273 (diff) | |
| download | openembedded-core-ba22cfac56120d001a53d33aee3b8eb3feda2786.tar.gz openembedded-core-ba22cfac56120d001a53d33aee3b8eb3feda2786.tar.bz2 openembedded-core-ba22cfac56120d001a53d33aee3b8eb3feda2786.tar.xz openembedded-core-ba22cfac56120d001a53d33aee3b8eb3feda2786.zip | |
cairo: only use x11 if selected in DISTRO_FEATURES
This makes it possible to build cairo-using apps without X11.
Signed-off-by: Phil Blundell <philb@gnu.org>
| -rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 72aaa0362..c983a89af 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 |