Patchwork [1/2] glib-2.0, dbus: drop dbus's dependency on glib and add dbus dependency to glib-2.0_2.26.1

login
register
mail settings
Submitter Martin Jansa
Date Dec. 29, 2010, 5:58 p.m.
Message ID <1293645497-22323-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/142/
State Superseded
Headers show

Comments

Martin Jansa - Dec. 29, 2010, 5:58 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/dbus/dbus.inc               |    2 +-
 recipes/glib-2.0/glib-2.0_2.26.1.bb |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Khem Raj - Dec. 29, 2010, 6:58 p.m.
On Wed, Dec 29, 2010 at 9:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>  recipes/dbus/dbus.inc               |    2 +-
>  recipes/glib-2.0/glib-2.0_2.26.1.bb |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc
> index 73fc426..c235f74 100644
> --- a/recipes/dbus/dbus.inc
> +++ b/recipes/dbus/dbus.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "A message bus system for inter-process communication"
>  HOMEPAGE = "http://dbus.freedesktop.org"
>  SECTION = "base"
>  LICENSE = "GPLv2+ AFLv2.1"
> -DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"
> +DEPENDS = "expat virtual/libintl libsm libice virtual/libx11"
>
>  INC_PR = "r19"
>
> diff --git a/recipes/glib-2.0/glib-2.0_2.26.1.bb b/recipes/glib-2.0/glib-2.0_2.26.1.bb
> index d95f894..5f7dbce 100644
> --- a/recipes/glib-2.0/glib-2.0_2.26.1.bb
> +++ b/recipes/glib-2.0/glib-2.0_2.26.1.bb
> @@ -6,9 +6,9 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
>  LICENSE = "LGPLv2+"
>  SECTION = "libs"
>  PRIORITY = "optional"
> -DEPENDS = "glib-2.0-native gtk-doc zlib"
> +DEPENDS = "glib-2.0-native gtk-doc zlib dbus"
>  DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
> -                            pkgconfig-native"
> +                            pkgconfig-native dbus-native"
>
>  PR = "r0"
>
> --
> 1.7.3.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Michael 'Mickey' Lauer - Dec. 29, 2010, 7:25 p.m.
Thanks for the patch, Martin.

Ack'ed by me as well, although ideally
we would outfactor something like dbus-headers,
since glib only requires the dbus headers, nothing
else.

Cheers,

:M:
Eric BENARD - Dec. 29, 2010, 7:44 p.m.
On 29/12/2010 19:58, Khem Raj wrote:
> On Wed, Dec 29, 2010 at 9:58 AM, Martin Jansa<martin.jansa@gmail.com>  wrote:
>> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
>
> Acked-by: Khem Raj<raj.khem@gmail.com>
>
>> ---
>>   recipes/dbus/dbus.inc               |    2 +-
>>   recipes/glib-2.0/glib-2.0_2.26.1.bb |    4 ++--
>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc
>> index 73fc426..c235f74 100644
>> --- a/recipes/dbus/dbus.inc
>> +++ b/recipes/dbus/dbus.inc
>> @@ -2,7 +2,7 @@ DESCRIPTION = "A message bus system for inter-process communication"
>>   HOMEPAGE = "http://dbus.freedesktop.org"
>>   SECTION = "base"
>>   LICENSE = "GPLv2+ AFLv2.1"
>> -DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"
>> +DEPENDS = "expat virtual/libintl libsm libice virtual/libx11"
>>
>>   INC_PR = "r19"
>>
>> diff --git a/recipes/glib-2.0/glib-2.0_2.26.1.bb b/recipes/glib-2.0/glib-2.0_2.26.1.bb
>> index d95f894..5f7dbce 100644
>> --- a/recipes/glib-2.0/glib-2.0_2.26.1.bb
>> +++ b/recipes/glib-2.0/glib-2.0_2.26.1.bb
>> @@ -6,9 +6,9 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
>>   LICENSE = "LGPLv2+"
>>   SECTION = "libs"
>>   PRIORITY = "optional"
>> -DEPENDS = "glib-2.0-native gtk-doc zlib"
>> +DEPENDS = "glib-2.0-native gtk-doc zlib dbus"
>>   DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
>> -                            pkgconfig-native"
>> +                            pkgconfig-native dbus-native"
>>

dbus dependency is not needed for glib-2.26.1. Compilation fails only on one 
test program (in gio/test) which is enabled because configure calls pkgconfig 
to detect dbus and OE's pkgconfig detects dbus-1.pc which was installed by 
dbus-native because PKG_CONFIG_PATH contains both native and non native 
directories.

A patch to workaround this in glib will come in a few minutes.

Eric
Andreas Oberritter - Dec. 29, 2010, 11:09 p.m.
On 12/29/2010 08:44 PM, Eric Bénard wrote:
> PKG_CONFIG_PATH contains both native
> and non native directories.

Is this a bug or expected behavior? If expected, why is it needed at all?

Regards,
Andreas
Eric BENARD - Dec. 29, 2010, 11:23 p.m.
On 30/12/2010 00:09, Andreas Oberritter wrote:
> On 12/29/2010 08:44 PM, Eric Bénard wrote:
>> PKG_CONFIG_PATH contains both native
>> and non native directories.
>
> Is this a bug or expected behavior? If expected, why is it needed at all?
>
this is an expected behavior as PKG_CONFIG_PATH is set in bitbake.conf
Kergoth told me on IRC it's for compiling sources which needs to compile 
something which runs on the host to generate the code for the target.

Eric

Patch

diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc
index 73fc426..c235f74 100644
--- a/recipes/dbus/dbus.inc
+++ b/recipes/dbus/dbus.inc
@@ -2,7 +2,7 @@  DESCRIPTION = "A message bus system for inter-process communication"
 HOMEPAGE = "http://dbus.freedesktop.org"
 SECTION = "base"
 LICENSE = "GPLv2+ AFLv2.1"
-DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"
+DEPENDS = "expat virtual/libintl libsm libice virtual/libx11"
 
 INC_PR = "r19"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.26.1.bb b/recipes/glib-2.0/glib-2.0_2.26.1.bb
index d95f894..5f7dbce 100644
--- a/recipes/glib-2.0/glib-2.0_2.26.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.26.1.bb
@@ -6,9 +6,9 @@  UNIX-like platforms, Windows, OS/2 and BeOS."
 LICENSE = "LGPLv2+"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "glib-2.0-native gtk-doc zlib"
+DEPENDS = "glib-2.0-native gtk-doc zlib dbus"
 DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
-                            pkgconfig-native"
+                            pkgconfig-native dbus-native"
 
 PR = "r0"