Patchwork [6/8] util-macros: fix DEPENDS in the case of native/nativesdk

login
mail settings
Submitter Joshua Lock
Date March 8, 2011, 6:47 p.m.
Message ID <1299610021.5026.9.camel@scimitar>
Download mbox | patch
Permalink /patch/1207/
State New, archived
Headers show

Comments

Joshua Lock - March 8, 2011, 6:47 p.m.
On Mon, 2011-03-07 at 16:29 -0800, Saul Wold wrote:
From: Dexuan Cui <dexuan.cui@intel.com>
> 
> This fixes [YOCTO #814]
> 
> Without the line fixing nativesdk, bitbake meta-toolchain-gmae would
> get the following:
> 
> Missing or unbuildable dependency chain was: ['meta-toolchain-gmae',
'task-sdk-host', 'qemu-nativesdk', 'libsdl-nativesdk',
'libx11-nativesdk', 'util-macros-nativesdk', 'libgpg-error-nativesdk']
> ERROR: Nothing PROVIDES 'libgpg-error-nativesdk'
> 
> [sgw: inherit gettext]
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../xorg-util/util-macros_1.11.0.bb                |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
> index 2bfe514..10de96c 100644
> --- a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
> +++ b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
> @@ -11,12 +11,13 @@ PE = "1"
>  PR = "r0"
>  
>  # ${PN} is empty so we need to tweak -dev and -dbg package
dependencies
> -DEPENDS = "gettext libgpg-error"
> -DEPENDS_virtclass-native = "gettext"
> +DEPENDS = "libgpg-error"
>  
>  RDEPENDS_${PN}-dev = ""
>  RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
>  
> +inherit gettext
> +
>  BBCLASSEXTEND = "native nativesdk"
>  
>  SRC_URI[md5sum] = "8580021f3a9e242ab09d23d62e475d53"
> 
By making this change you've introduced the requirement for native and
nativesdk variants of libgpg-error, we don't want nor need this for the
-native* builds which is why we had a line explicitly setting the
DEPENDS for native.

The right way to do this is to have a similar line for the nativesdk
DEPENDS as per the attached patch (and my josh/bernard branch on
poky-contrib).

Cheers,
Joshua

Patch

From 48f856c6bdb8c7ddaf23963238ab52fb8856cdd5 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Tue, 8 Mar 2011 10:20:27 -0800
Subject: [PATCH] util-macros: fix DEPENDS for nativesdk

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../xorg-util/util-macros_1.11.0.bb                |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
index 2bfe514..e2c558c 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
@@ -13,6 +13,7 @@  PR = "r0"
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 DEPENDS = "gettext libgpg-error"
 DEPENDS_virtclass-native = "gettext"
+DEPENDS_virtclass-nativesdk = "gettext"
 
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
-- 
1.7.4