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-graphics/xorg-xserver/xserver-xorg.inc | |
| 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-graphics/xorg-xserver/xserver-xorg.inc')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index cc1c02b553..9881c942b8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
| @@ -23,6 +23,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" | |||
| 23 | 23 | ||
| 24 | inherit autotools pkgconfig | 24 | inherit autotools pkgconfig |
| 25 | 25 | ||
| 26 | inherit distro_features_check | ||
| 27 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 28 | |||
| 26 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" | 29 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" |
| 27 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" | 30 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" |
| 28 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" | 31 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" |