Patchwork dbus-glib: Conditionaly adds dbus-x11 to RDEPENDS_${PN}-tests

login
mail settings
Submitter Noor Ahsan
Date July 27, 2012, 1:10 p.m.
Message ID <365E1805BC95084CBE82381A0B8699945BD9B9B0@EU-MBX-03.mgc.mentorg.com>
Download mbox | patch
Permalink /patch/33227/
State New
Headers show

Comments

Noor Ahsan - July 27, 2012, 1:10 p.m.
From: Noor Ahsan <noor_ahsan@mentor.com<mailto:noor_ahsan@mentor.com>>

*  Build was hitting an error "Nothing RPROVIDES 'dbus-x11'". dbus-glib RDEPENDS on it and
dbus was providing dbus-x11 when x11 was present in DISTRO FEATURES. So conditionally
added dbus-x11 to RDEPENDS_${PN}-tests in dbus-glib recipe.
* Verified on qemuppc.

Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
---
meta/recipes-core/dbus/dbus-glib.inc |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Chris Larson - July 27, 2012, 2:44 p.m.
On Fri, Jul 27, 2012 at 6:10 AM, Ahsan, Noor <Noor_Ahsan@mentor.com> wrote:
> From: Noor Ahsan <noor_ahsan@mentor.com>
>
> *  Build was hitting an error "Nothing RPROVIDES 'dbus-x11'". dbus-glib
> RDEPENDS on it and
>
> dbus was providing dbus-x11 when x11 was present in DISTRO FEATURES. So
> conditionally
>
> added dbus-x11 to RDEPENDS_${PN}-tests in dbus-glib recipe.
>
> * Verified on qemuppc.
>
> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>

I think this is a better fix:

-PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests"
+PACKAGES += "${PN}-bash-completion ${@base_contains('PACKAGECONFIG',
'tests', '${PN}-tests-dbg ${PN}-tests', '', d}"

Due to this:

PACKAGECONFIG ??= ""
PACKAGECONFIG[tests] = "--enable-tests,,,"
Richard Purdie - July 27, 2012, 4:20 p.m.
On Fri, 2012-07-27 at 07:44 -0700, Chris Larson wrote:
> On Fri, Jul 27, 2012 at 6:10 AM, Ahsan, Noor <Noor_Ahsan@mentor.com> wrote:
> > From: Noor Ahsan <noor_ahsan@mentor.com>
> >
> > *  Build was hitting an error "Nothing RPROVIDES 'dbus-x11'". dbus-glib
> > RDEPENDS on it and
> >
> > dbus was providing dbus-x11 when x11 was present in DISTRO FEATURES. So
> > conditionally
> >
> > added dbus-x11 to RDEPENDS_${PN}-tests in dbus-glib recipe.
> >
> > * Verified on qemuppc.
> >
> > Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
> 
> I think this is a better fix:
> 
> -PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests"
> +PACKAGES += "${PN}-bash-completion ${@base_contains('PACKAGECONFIG',
> 'tests', '${PN}-tests-dbg ${PN}-tests', '', d}"
> 
> Due to this:
> 
> PACKAGECONFIG ??= ""
> PACKAGECONFIG[tests] = "--enable-tests,,,"

Its also worth noting that the dbus-x11 package is soon to be no more
given other patches on the mailing list.

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index a8e6d42..9cfe796 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -35,7 +35,7 @@  FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/dbus-bash-complet
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-RDEPENDS_${PN}-tests += "dbus-x11"
+RDEPENDS_${PN}-tests += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
FILES_${PN}-tests = "${datadir}/${PN}/tests"
FILES_${PN}-tests-dbg = "${datadir}/${PN}/tests/.debug/* \
                          ${datadir}/${PN}/tests/core/.debug/* \
--
1.7.10.4