qt4: allow builds for mips64 but disable webkit for n32

From: Jackie Huang <[email protected]>

The following changes since commit ff2ff155ea5273b2023a1c9834b13f10249d343f:

gdk-pixbuf: use ptest-gnome (2014-11-25 12:58:21 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib jhuang0/d_qt4-webkit_0
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_qt4-webkit_0

Jackie Huang (2):
Revert "qt4*.bbclass: disable build qt on mips64 with 64 bits
userspace"
qt4: disable webkit for mips64 n32 temporarily

 meta/classes/qt4e.bbclass         |    3 ---
 meta/classes/qt4x11.bbclass       |    3 ---
 meta/recipes-qt/qt4/qt4-4.8.6.inc |    5 +++++
 3 files changed, 5 insertions(+), 6 deletions(-)

1.7.9.5

From: Jackie Huang <[email protected]>

This reverts commit 17890ebd637da0b3bf78804002d8b4f0ace078d2.

qt4 is upgraded to 4.8.6 and this is fixed by:
c889b40 qt webkit: add support for MIPS64 platforms

so revert the commit.

---
 meta/classes/qt4e.bbclass   |    3 ---
 meta/classes/qt4x11.bbclass |    3 ---
 2 files changed, 6 deletions(-)

index 850bb6a..13b1050 100644
@@ -19,6 +19,3 @@ EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} "
 
 # Qt4 uses atomic instructions not supported in thumb mode
 ARM_INSTRUCTION_SET = "arm"
-
-# Qt4 could NOT be built on MIPS64 with 64 bits userspace
-COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"

index 65d196a..b06e15d 100644
@@ -9,6 +9,3 @@ QT_LIBINFIX = ""
 
 # Qt4 uses atomic instructions not supported in thumb mode
 ARM_INSTRUCTION_SET = "arm"
-
-# Qt4 could NOT be built on MIPS64 with 64 bits userspace
-COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"

1.7.9.5

From: Jackie Huang <[email protected]>

Disable webkit for mips64 n32 temporarily that fails to compile.

The webkit package also disable the build for n32:
f5c4d18 webkit/midori: block to build webkit on mips64 with libn32 ABI

The opened defect in qt upstream is:
https://bugreports.qt-project.org/browse/QTBUG-39224

---
 meta/recipes-qt/qt4/qt4-4.8.6.inc |    5 +++++
 1 file changed, 5 insertions(+)

index ae6692b..924a6ad 100644
@@ -31,6 +31,11 @@ SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa70
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
+# disable webkit for mips64 n32 temporarily that fails to compile,
+# qt upstream defect:
+# https://bugreports.qt-project.org/browse/QTBUG-39224
+QT_CONFIG_FLAGS_append_mips64 = "${@bb.utils.contains("TUNE_FEATURES", "n32", " -no-webkit", "" ,d)}"
+
 FILES_${QT_BASE_NAME}-tools_append     = " ${bindir}/qml ${bindir}/qmlplugindump"
 FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
 

1.7.9.5