summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2015-01-21 22:45:28 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:49 +0000
commit3bf5b6de3edb0d6589155fc1e2cd284c05532c52 (patch)
treed23916356c995f2e36a5aaffa953c6fa710c4d33 /meta/recipes-sato
parente558e5489da890ff28a1360e279726b51edb1a73 (diff)
downloadpoky-3bf5b6de3edb0d6589155fc1e2cd284c05532c52.tar.gz
arch-mips.inc: Change definition of TRANSLATED_TARGET_ARCH
[YOCTO #7230] In certain system configurations TRANSLATED_TARGET_ARCH will not expand in the right order for gcc-cross-candian-mips64n32 to be generated properly. This will cause SDKs to fail to generate properly. Changing the global definition of TRANSLATED_TARGET_ARCH always expands the ABIEXTENSION, which causes the OVERRIDES to pick it up as well. This effectively defines a new class of overrides for the 'n32'. The side effect is that we need to duplicate some mips64 overrides, and redefine others that were previously 'n32' or 'mips64' exclusive to have the correct semantics. (From OE-Core rev: 4b3a2b703b20583bd107f00a297d972e9bfb514a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb1
-rw-r--r--meta/recipes-sato/midori/midori_0.5.8.bb2
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb2
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 1c4f328459..62836f94d3 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -6,6 +6,7 @@ form a standalone SDK."
6 6
7QT4PKG = "qt4-pkgs" 7QT4PKG = "qt4-pkgs"
8QT4PKG_mips64 = "" 8QT4PKG_mips64 = ""
9QT4PKG_mips64n32 = ""
9 10
10IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \ 11IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \
11 tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" 12 tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb
index 299ecb324c..3aabdd4385 100644
--- a/meta/recipes-sato/midori/midori_0.5.8.bb
+++ b/meta/recipes-sato/midori/midori_0.5.8.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751
10 10
11# midori depends on webkit-gtk, and webkit-gtk can NOT be built on 11# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
12# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. 12# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
13COMPATIBLE_HOST_mips64 = "mips64.*-linux$" 13COMPATIBLE_HOST_mips64n32 = "null"
14 14
15inherit gtk-icon-cache pkgconfig vala pythonnative cmake 15inherit gtk-icon-cache pkgconfig vala pythonnative cmake
16 16
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 29f8a7993f..920e1a0a76 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -32,7 +32,7 @@ SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"
32SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" 32SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7"
33 33
34# webkit-gtk can NOT be built on MIPS64 with n32 ABI 34# webkit-gtk can NOT be built on MIPS64 with n32 ABI
35COMPATIBLE_HOST_mips64 = "mips64.*-linux$" 35COMPATIBLE_HOST_mips64n32 = "null"
36 36
37inherit autotools lib_package gtk-doc pkgconfig 37inherit autotools lib_package gtk-doc pkgconfig
38 38