From 4b3a2b703b20583bd107f00a297d972e9bfb514a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 21 Jan 2015 22:45:28 -0600 Subject: 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. Signed-off-by: Mark Hatle --- meta/recipes-sato/images/core-image-sato-sdk.bb | 1 + meta/recipes-sato/midori/midori_0.5.8.bb | 2 +- meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-sato') 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." QT4PKG = "qt4-pkgs" QT4PKG_mips64 = "" +QT4PKG_mips64n32 = "" IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \ 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 # midori depends on webkit-gtk, and webkit-gtk can NOT be built on # MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" +COMPATIBLE_HOST_mips64n32 = "null" inherit gtk-icon-cache pkgconfig vala pythonnative cmake 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" SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" # webkit-gtk can NOT be built on MIPS64 with n32 ABI -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" +COMPATIBLE_HOST_mips64n32 = "null" inherit autotools lib_package gtk-doc pkgconfig -- cgit 1.2.3-korg