Patchwork glib 2.26.1: fix compilation failure

login
register
mail settings
Submitter Eric BENARD
Date Dec. 29, 2010, 7:45 p.m.
Message ID <1293651953-2998-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/143/
State Accepted
Headers show

Comments

Eric BENARD - Dec. 29, 2010, 7:45 p.m.
during configure, pkgconfig detects dbus-1.pc which was installed
by dbus-native and thus the compilation fails because it can't
find dbus/dbus.h which is not yet installed for in the target's
sysroot.

This patch workaround this problem by not compiling the test program
which depends on dbus's headers.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 recipes/glib-2.0/glib-2.0_2.26.1.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Khem Raj - Dec. 29, 2010, 9:19 p.m.
On Wed, Dec 29, 2010 at 11:45 AM, Eric Bénard <eric@eukrea.com> wrote:
> during configure, pkgconfig detects dbus-1.pc which was installed
> by dbus-native and thus the compilation fails because it can't
> find dbus/dbus.h which is not yet installed for in the target's
> sysroot.
>
> This patch workaround this problem by not compiling the test program
> which depends on dbus's headers.
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>

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

> ---
>  recipes/glib-2.0/glib-2.0_2.26.1.bb |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> 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..e19fb9f 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
> @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0-native gtk-doc zlib"
>  DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
>                             pkgconfig-native"
>
> -PR = "r0"
> +PR = "r1"
>
>  SRC_URI = "\
>   http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2;name=archive \
> @@ -38,6 +38,7 @@ EXTRA_OECONF_append_glibc_arm = "  --enable-included-printf=no "
>
>  do_configure_prepend () {
>        install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
> +       sed -i -e "s:TEST_PROGS += gdbus-serialization::g"  ${S}/gio/tests/Makefile.am
>  }
>
>  do_install_append() {
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Martin Jansa - Dec. 30, 2010, 4:32 a.m.
On Wed, Dec 29, 2010 at 01:19:21PM -0800, Khem Raj wrote:
> On Wed, Dec 29, 2010 at 11:45 AM, Eric Bénard <eric@eukrea.com> wrote:
> > during configure, pkgconfig detects dbus-1.pc which was installed
> > by dbus-native and thus the compilation fails because it can't
> > find dbus/dbus.h which is not yet installed for in the target's
> > sysroot.
> >
> > This patch workaround this problem by not compiling the test program
> > which depends on dbus's headers.
> >
> > Signed-off-by: Eric Bénard <eric@eukrea.com>
> 
> Acked-by: Khem Raj <raj.khem@gmail.com>

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> 
> > ---
> >  recipes/glib-2.0/glib-2.0_2.26.1.bb |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > 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..e19fb9f 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
> > @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0-native gtk-doc zlib"
> >  DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
> >                             pkgconfig-native"
> >
> > -PR = "r0"
> > +PR = "r1"
> >
> >  SRC_URI = "\
> >   http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2;name=archive \
> > @@ -38,6 +38,7 @@ EXTRA_OECONF_append_glibc_arm = "  --enable-included-printf=no "
> >
> >  do_configure_prepend () {
> >        install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
> > +       sed -i -e "s:TEST_PROGS += gdbus-serialization::g"  ${S}/gio/tests/Makefile.am
> >  }
> >
> >  do_install_append() {
> > --
> > 1.7.0.4
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> >
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

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..e19fb9f 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
@@ -10,7 +10,7 @@  DEPENDS = "glib-2.0-native gtk-doc zlib"
 DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
                             pkgconfig-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2;name=archive \
@@ -38,6 +38,7 @@  EXTRA_OECONF_append_glibc_arm = "  --enable-included-printf=no "
 
 do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+	sed -i -e "s:TEST_PROGS += gdbus-serialization::g"  ${S}/gio/tests/Makefile.am
 }
 
 do_install_append() {