Patchwork [meta-oe] midori: disable gtk3

login
register
mail settings
Submitter Martin Jansa
Date Feb. 21, 2012, 5:49 p.m.
Message ID <1329846599-3469-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/21493/
State Accepted
Commit 1e3ebb18e3032a0d90fc78d909d036546bddd889
Headers show

Comments

Martin Jansa - Feb. 21, 2012, 5:49 p.m.
* waf configure/waf build always hangs when gtk3 was built before midori

* usually it's on this line:
  | Checking for program glib-genmarshal        : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/glib-genmarshal
  | Checking for program glib-mkenums           : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/glib-mkenums
  | Checking for program msgfmt                 : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/msgfmt
  | Checking for program intltool-merge         : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/intltool-merge
  | Checking for header locale.h                :
  but I guess, that's it's because glib-genmarshal or glib-mkenums,
  because if I finish do_configure somehow manually then waf build hangs
  as soon as it starts glib_genmarshal (or seemingly a bit later if there is more processes)
  | Waf: Entering directory `/OE/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/midori/midori-0.4.3-r0/midori-0.4.3/_build_'
  | [  1/121] glib_genmarshal: midori/marshal.list -> _build_/default/midori/marshal.h _build_/default/midori/marshal.c
  | [  2/121] valac: katze/midori-uri.vala midori/midori-extensions-column.vala -> _build_/default/katze/midori-uri.c _build_/default/midori/midori-core.h _build_/default/midori/midori-core.vapi _build_/default/midori/midori-core.deps _build_/default/midori/midori-extensions-column.c _build_/default/midori/midori-core.h _build_/default/midori/midori-core.vapi _build_/default/midori/midori-core.deps
  | ../katze/midori-uri.vala:19.60-19.74: warning: use of possibly unassigned parameter `path'
  | ../katze/midori-uri.vala:19.60-19.74: warning: use of possibly unassigned parameter `path'
  | ../katze/midori-uri.vala:19.60-19.74: warning: use of possibly unassigned parameter `path'
  | ../katze/midori-uri.vala:134.34-134.49: warning: use of possibly unassigned parameter `label'
  | ../katze/midori-uri.vala:134.13-134.31: warning: use of possibly unassigned parameter `checksum'
  | Waf: Leaving directory `/OE/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/midori/midori-0.4.3-r0/midori-0.4.3/_build_'
  | Build failed:  -> task failed (err #-15):
  |       {task: glib_genmarshal marshal.list -> marshal.h,marshal.c}

* I was able to reproduce this 100%, I know that before it also hanged from
  time to time in waf

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/midori/midori.inc     |    1 +
 .../recipes-connectivity/midori/midori_0.4.3.bb    |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
Martin Jansa - Feb. 21, 2012, 11:26 p.m.
On Tue, Feb 21, 2012 at 06:49:59PM +0100, Martin Jansa wrote:
> * waf configure/waf build always hangs when gtk3 was built before midori
> 
> * usually it's on this line:
>   | Checking for program glib-genmarshal        : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/glib-genmarshal
>   | Checking for program glib-mkenums           : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/glib-mkenums
>   | Checking for program msgfmt                 : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/msgfmt
>   | Checking for program intltool-merge         : /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/intltool-merge
>   | Checking for header locale.h                :
>   but I guess, that's it's because glib-genmarshal or glib-mkenums,
>   because if I finish do_configure somehow manually then waf build hangs
>   as soon as it starts glib_genmarshal (or seemingly a bit later if there is more processes)
>   | Waf: Entering directory `/OE/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/midori/midori-0.4.3-r0/midori-0.4.3/_build_'
>   | [  1/121] glib_genmarshal: midori/marshal.list -> _build_/default/midori/marshal.h _build_/default/midori/marshal.c
>   | [  2/121] valac: katze/midori-uri.vala midori/midori-extensions-column.vala -> _build_/default/katze/midori-uri.c _build_/default/midori/midori-core.h _build_/default/midori/midori-core.vapi _build_/default/midori/midori-core.deps _build_/default/midori/midori-extensions-column.c _build_/default/midori/midori-core.h _build_/default/midori/midori-core.vapi _build_/default/midori/midori-core.deps
>   | ../katze/midori-uri.vala:19.60-19.74: warning: use of possibly unassigned parameter `path'
>   | ../katze/midori-uri.vala:19.60-19.74: warning: use of possibly unassigned parameter `path'
>   | ../katze/midori-uri.vala:19.60-19.74: warning: use of possibly unassigned parameter `path'
>   | ../katze/midori-uri.vala:134.34-134.49: warning: use of possibly unassigned parameter `label'
>   | ../katze/midori-uri.vala:134.13-134.31: warning: use of possibly unassigned parameter `checksum'
>   | Waf: Leaving directory `/OE/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/midori/midori-0.4.3-r0/midori-0.4.3/_build_'
>   | Build failed:  -> task failed (err #-15):
>   |       {task: glib_genmarshal marshal.list -> marshal.h,marshal.c}
> 
> * I was able to reproduce this 100%, I know that before it also hanged from
>   time to time in waf

Looks like this isn't enough to get rid of hangs completely, but at
least increases chances to be able to finish it, before this change I've
tried on one host >10 times without luck, then it worked imediately
after this patch and now it failed when building for other architecture
but worked in another run..

Cheers,

> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-connectivity/midori/midori.inc     |    1 +
>  .../recipes-connectivity/midori/midori_0.4.3.bb    |    2 ++
>  2 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/midori/midori.inc b/meta-oe/recipes-connectivity/midori/midori.inc
> index 05db643..6837bfb 100644
> --- a/meta-oe/recipes-connectivity/midori/midori.inc
> +++ b/meta-oe/recipes-connectivity/midori/midori.inc
> @@ -22,6 +22,7 @@ do_configure() {
>              --infodir=${infodir} \
>              --mandir=${mandir} \
>              --disable-hildon \
> +            --disable-gtk3 \
>  }
>  
>  LDFLAGS_append = " -ljavascriptcoregtk-1.0 "
> diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
> index 2be8274..635eb9e 100644
> --- a/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
> +++ b/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
> @@ -1,5 +1,7 @@
>  require midori.inc
>  
> +PR = "r1"
> +
>  SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
>             file://waf \
>            "
> -- 
> 1.7.8.4
>

Patch

diff --git a/meta-oe/recipes-connectivity/midori/midori.inc b/meta-oe/recipes-connectivity/midori/midori.inc
index 05db643..6837bfb 100644
--- a/meta-oe/recipes-connectivity/midori/midori.inc
+++ b/meta-oe/recipes-connectivity/midori/midori.inc
@@ -22,6 +22,7 @@  do_configure() {
             --infodir=${infodir} \
             --mandir=${mandir} \
             --disable-hildon \
+            --disable-gtk3 \
 }
 
 LDFLAGS_append = " -ljavascriptcoregtk-1.0 "
diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
index 2be8274..635eb9e 100644
--- a/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
+++ b/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
@@ -1,5 +1,7 @@ 
 require midori.inc
 
+PR = "r1"
+
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
            file://waf \
           "