summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
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-qt
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-qt')
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt.bb2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6.inc2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index d28e032293..5f6916a430 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
7PR = "r4" 7PR = "r4"
8 8
9# Qt4 could NOT be built on MIPS64 with 64 bits userspace 9# Qt4 could NOT be built on MIPS64 with 64 bits userspace
10COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" 10COMPATIBLE_HOST_mips64 = "null"
11 11
12inherit packagegroup 12inherit packagegroup
13 13
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index d7a457cff9..d4f0fd1d8c 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -3,7 +3,7 @@ PR = "r2"
3LICENSE = "MIT" 3LICENSE = "MIT"
4 4
5# Qt4 could NOT be built on MIPS64 with 64 bits userspace 5# Qt4 could NOT be built on MIPS64 with 64 bits userspace
6COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" 6COMPATIBLE_HOST_mips64 = "null"
7 7
8inherit packagegroup 8inherit packagegroup
9 9
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
index fc1ccba9a7..02a032658d 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc
@@ -1,7 +1,7 @@
1LICENSE = "MIT" 1LICENSE = "MIT"
2 2
3# Qt4 could NOT be built on MIPS64 with 64 bits userspace 3# Qt4 could NOT be built on MIPS64 with 64 bits userspace
4COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" 4COMPATIBLE_HOST_mips64 = "null"
5 5
6inherit packagegroup 6inherit packagegroup
7 7
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.6.inc
index a2c0688c72..bd20dac66c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.6.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.6.inc
@@ -39,7 +39,7 @@ S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
39# disable webkit for mips64 n32 temporarily that fails to compile, 39# disable webkit for mips64 n32 temporarily that fails to compile,
40# qt upstream defect: 40# qt upstream defect:
41# https://bugreports.qt-project.org/browse/QTBUG-39224 41# https://bugreports.qt-project.org/browse/QTBUG-39224
42QT_CONFIG_FLAGS_append_mips64 = "${@bb.utils.contains("TUNE_FEATURES", "n32", " -no-webkit", "" ,d)}" 42QT_CONFIG_FLAGS_append_mips64n32 = " -no-webkit"
43 43
44# disable webkit for aarch64 temporarily that fails to compile 44# disable webkit for aarch64 temporarily that fails to compile
45QT_CONFIG_FLAGS_append_aarch64 = " -no-webkit" 45QT_CONFIG_FLAGS_append_aarch64 = " -no-webkit"