From 41719e1bfbc969ac0493b1ee81bf24973f5f7d44 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 10 May 2015 19:17:07 -0700 Subject: libowl/settings-daemon/libnotify: add x11 to REQUIRED_DISTRO_FEATURES The libowl, settings-daemon and libnotify requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES, so add x11 to REQUIRED_DISTRO_FEATURES. The leafpad, settings-daemon and oh-puzzles requires libowl or settings-daemon, so add xx to REQUIRED_DISTRO_FEATURES for them too. The leafpad can't be built without libowl, so depends in directly rather than use DEPENDS_append_poky. (From OE-Core rev: 1722ce23075a00e111145cad6daa2ef87ba391fe) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-sato/puzzles/oh-puzzles_git.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-sato/puzzles') diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb index bd762e9315..36cd2cc7a2 100644 --- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb +++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb @@ -9,7 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \ SECTION = "x11" DEPENDS = "gtk+ gconf intltool-native librsvg" -DEPENDS_append_poky = " libowl" + +# libowl requires x11 in DISTRO_FEATURES +DEPENDS_append_poky = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libowl', '', d)}" + +# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b" PV = "0.2+git${SRCPV}" @@ -20,7 +25,7 @@ SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 " S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check bindir = "/usr/games" -- cgit v1.2.3-54-g00ecf