diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-19 13:47:03 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-01 08:54:34 +0100 |
commit | bcfc89236b7a96eb00999492351fb9cafc0cbf84 (patch) | |
tree | 700eea3e6fa0bb38babc5a376be9a63e366eb2a5 /meta-oe/recipes-connectivity | |
parent | 2f260409a03d6e09c00b0bc58858f962629ae585 (diff) | |
download | meta-openembedded-bcfc89236b7a96eb00999492351fb9cafc0cbf84.tar.gz |
midori: fix build with dirty vala
* there is only one line added to default waf file
in unpack_wafdir() just before last chdir and return
because those files are downloaded and cannot be patched in normal way
os.system("sed -i \"s/version=output.split/version=output.replace('-dirty','').split/g\" wafadmin/Tools/vala.py")
* It fails to parse version like this
/OE/shr-core/tmp/sysroots/x86_64-linux/usr/bin/valac --version
Vala 0.12.1-dirty
reporting 0.0.0 instead which breaks configure
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rwxr-xr-x | meta-oe/recipes-connectivity/midori/midori-0.4.1/waf | bin | 0 -> 92569 bytes | |||
-rw-r--r-- | meta-oe/recipes-connectivity/midori/midori_0.4.1.bb | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf b/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf new file mode 100755 index 000000000..b74a2d809 --- /dev/null +++ b/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf | |||
Binary files differ | |||
diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb index 2805b92b9..860ed219e 100644 --- a/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +++ b/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb | |||
@@ -1,7 +1,15 @@ | |||
1 | require midori.inc | 1 | require midori.inc |
2 | 2 | ||
3 | PR = "r1" | ||
4 | |||
3 | SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ | 5 | SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ |
6 | file://waf \ | ||
4 | " | 7 | " |
8 | |||
9 | do_configure_prepend() { | ||
10 | cp -f ${WORKDIR}/waf ${S}/ | ||
11 | } | ||
12 | |||
5 | SRC_URI[midori.md5sum] = "33dde203cd71ae2b1d2adcc7f5739f65" | 13 | SRC_URI[midori.md5sum] = "33dde203cd71ae2b1d2adcc7f5739f65" |
6 | SRC_URI[midori.sha256sum] = "b3c77ddb6f562a0ea3d2e6fbb756ca0dc158ad8410f4b60f8e5998c2f7305f07" | 14 | SRC_URI[midori.sha256sum] = "b3c77ddb6f562a0ea3d2e6fbb756ca0dc158ad8410f4b60f8e5998c2f7305f07" |
7 | 15 | ||