Patchwork gdk-pixbuf: Ensure gdk-pixbuf-native dependencies are correct with linuxstdbase

login
register
mail settings
Submitter Richard Purdie
Date Oct. 2, 2012, 12:09 a.m.
Message ID <1349136558.15753.124.camel@ted>
Download mbox | patch
Permalink /patch/37579/
State Accepted
Commit ae4552ac1bc286ea69d8d4e533702a9e7bbde656
Headers show

Comments

Richard Purdie - Oct. 2, 2012, 12:09 a.m.
Without this change, anything using linuxstdbase would incorrectly
try and pull in X dependencies.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Paul Eggleton - Oct. 2, 2012, 6:48 a.m.
On Tuesday 02 October 2012 01:09:18 Richard Purdie wrote:
> Without this change, anything using linuxstdbase would incorrectly
> try and pull in X dependencies.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb index 82a7eaa..8d18b87
> 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> @@ -35,6 +35,7 @@ EXTRA_OECONF = "\
>  "
>  X11DEPENDS = "--without-x11"
>  X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11',
> '--with-x11', '--without-x11', d)}" +X11
> DEPENDS_virtclass-native = "--without-x11"
> 
>  PACKAGES =+ "${PN}-xlib"

Thanks, FYI this fixes [YOCTO #3154].

Cheers,
Paul

Patch

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index 82a7eaa..8d18b87 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -35,6 +35,7 @@  EXTRA_OECONF = "\
 "
 X11DEPENDS = "--without-x11"
 X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
+X11DEPENDS_virtclass-native = "--without-x11"
 
 PACKAGES =+ "${PN}-xlib"