summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2013-11-25 16:58:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-25 16:14:47 +0000
commit2eccff75d1e201a536c82a649635e2fb2605b6f3 (patch)
treec6231f3d3dc1c592e7f25861c85ba19361844035
parent2d5b4af33882b3c7731d6aa1f4a67734d80c9afa (diff)
downloadpoky-2eccff75d1e201a536c82a649635e2fb2605b6f3.tar.gz
webkit/midori: fix COMPATIBLE_HOST
webkit can not be built on mips64 with n32 ABI, but can be built on mips64 n64 and o32 ABI whose TARGET_SYS's name is mips-*-linux (From OE-Core rev: 66cf1cc01b8e4f6284e13d57d9fdcb9f228a6846) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/midori/midori_0.5.5.bb4
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-sato/midori/midori_0.5.5.bb b/meta/recipes-sato/midori/midori_0.5.5.bb
index 7c233cbd4b..d3f42cc06e 100644
--- a/meta/recipes-sato/midori/midori_0.5.5.bb
+++ b/meta/recipes-sato/midori/midori_0.5.5.bb
@@ -11,8 +11,8 @@ SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac"
11SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62" 11SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62"
12 12
13# midori depends on webkit-gtk, and webkit-gtk can NOT be built on 13# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
14# MIPS64 with 64 bits userspace. So remove it from mips64 temporarily. 14# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
15COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" 15COMPATIBLE_HOST_mips64 = "mips64.*-linux"
16 16
17inherit gtk-icon-cache pkgconfig vala pythonnative 17inherit gtk-icon-cache pkgconfig vala pythonnative
18 18
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index adab4fa753..3581de316a 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -31,8 +31,8 @@ SRC_URI = "\
31SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" 31SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"
32SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" 32SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7"
33 33
34# webkit-gtk can NOT be built on MIPS64 with 64 bits userspace 34# webkit-gtk can NOT be built on MIPS64 with n32 ABI
35COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" 35COMPATIBLE_HOST_mips64 = "mips64.*-linux"
36 36
37inherit autotools lib_package gtk-doc pkgconfig 37inherit autotools lib_package gtk-doc pkgconfig
38 38