[oe-commits] Phil Blundell : cairo: only use x11 if selected in DISTRO_FEATURES
git version control
git at git.openembedded.org
Mon Aug 15 14:15:07 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: ba22cfac56120d001a53d33aee3b8eb3feda2786
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ba22cfac56120d001a53d33aee3b8eb3feda2786
Author: Phil Blundell <philb at gnu.org>
Date: Fri Aug 12 16:58:32 2011 +0100
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 at gnu.org>
---
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 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"
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
More information about the Openembedded-commits
mailing list