summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-02-21 17:49:59 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-02-22 09:42:05 +0100
commit1e3ebb18e3032a0d90fc78d909d036546bddd889 (patch)
tree156f119a740f07221d0c5610266c507bb83c2d07 /meta-oe
parenta07cfc98590c66e9a1c7596a160f01b36ddc2d54 (diff)
downloadmeta-openembedded-1e3ebb18e3032a0d90fc78d909d036546bddd889.tar.gz
midori: disable gtk3
* 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> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/midori/midori.inc1
-rw-r--r--meta-oe/recipes-connectivity/midori/midori_0.4.3.bb2
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 05db643bc..6837bfb89 100644
--- a/meta-oe/recipes-connectivity/midori/midori.inc
+++ b/meta-oe/recipes-connectivity/midori/midori.inc
@@ -22,6 +22,7 @@ do_configure() {
22 --infodir=${infodir} \ 22 --infodir=${infodir} \
23 --mandir=${mandir} \ 23 --mandir=${mandir} \
24 --disable-hildon \ 24 --disable-hildon \
25 --disable-gtk3 \
25} 26}
26 27
27LDFLAGS_append = " -ljavascriptcoregtk-1.0 " 28LDFLAGS_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 2be8274f4..635eb9e03 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 @@
1require midori.inc 1require midori.inc
2 2
3PR = "r1"
4
3SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ 5SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
4 file://waf \ 6 file://waf \
5 " 7 "