diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:53:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:43:32 +0100 |
commit | 5bfcd13c074a69cfb1cf9108cbccee472bad4409 (patch) | |
tree | dd7184e90b27bd4f5c36e390a1bcddaf3252e2cf /meta/recipes-support | |
parent | 5b629a962d05aa1ae9d017058d078476d3675850 (diff) | |
download | poky-5bfcd13c074a69cfb1cf9108cbccee472bad4409.tar.gz |
classes/meta: Add DISTRO_FEATURES check for gtk+/gtk3+
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libfm/libfm_1.2.3.bb | 3 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte.inc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb index 629502f68f..b225232f39 100644 --- a/meta/recipes-support/libfm/libfm_1.2.3.bb +++ b/meta/recipes-support/libfm/libfm_1.2.3.bb | |||
@@ -18,7 +18,8 @@ SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344 | |||
18 | 18 | ||
19 | PR = "r1" | 19 | PR = "r1" |
20 | 20 | ||
21 | inherit autotools pkgconfig gtk-doc | 21 | inherit autotools pkgconfig gtk-doc distro_features_check |
22 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
22 | 23 | ||
23 | do_configure[dirs] =+ "${S}/m4" | 24 | do_configure[dirs] =+ "${S}/m4" |
24 | 25 | ||
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc index 874062adbe..07b9e10dce 100644 --- a/meta/recipes-support/vte/vte.inc +++ b/meta/recipes-support/vte/vte.inc | |||
@@ -4,7 +4,8 @@ LICENSE = "LGPLv2.0" | |||
4 | DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub" | 4 | DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub" |
5 | RDEPENDS_libvte = "vte-termcap" | 5 | RDEPENDS_libvte = "vte-termcap" |
6 | 6 | ||
7 | inherit gnome gtk-doc | 7 | inherit gnome gtk-doc distro_features_check |
8 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
8 | 9 | ||
9 | EXTRA_OECONF = "--disable-python --disable-introspection" | 10 | EXTRA_OECONF = "--disable-python --disable-introspection" |
10 | 11 | ||