Bug#719763: QT4 FTBFS on mips64(el) and mipsn32(el)
Package: qt4-x11
When build on mips64(el) and mipsn32(el) it failed.
This patch can fix this problem.
Please consider it.
Thanks
diff --git a/debian/changelog b/debian/changelog
index 15aebe3..85a3ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.5+dfsg-2+nmu2) unstable; urgency=low
+
+ * Fix FTBFS for mips64(el)
+
+ -- YunQiang Su <wzssyqa@gmail.com> Sun, 11 Aug 2013 22:09:32 +0800
+
qt4-x11 (4:4.8.5+dfsg-2) unstable; urgency=low
* Make qtcore4-l10n M-A: foreign. Due to a limitation in dpkg which does not
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 09cbcd9..69653b1 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -6,9 +6,11 @@ Trolltech task ID : 181882
configure | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
---- a/configure
-+++ b/configure
-@@ -247,7 +247,50 @@ DeviceVar()
+Index: qt4-x11/configure
+===================================================================
+--- qt4-x11.orig/configure 2013-08-12 00:37:06.651028807 +0800
++++ qt4-x11/configure 2013-08-12 00:38:19.831030848 +0800
+@@ -247,7 +247,50 @@
#-------------------------------------------------------------------------------
# need that throughout the script
@@ -45,7 +47,7 @@ Trolltech task ID : 181882
+ lpia)
+ UNAME_MACHINE="i686"
+ ;;
-+ mipsel)
++ mips*)
+ UNAME_MACHINE="mips"
+ ;;
+ powerpc)
diff --git a/debian/patches/mips64-jscore.diff b/debian/patches/mips64-jscore.diff
new file mode 100644
index 0000000..3fc47f7
--- /dev/null
+++ b/debian/patches/mips64-jscore.diff
@@ -0,0 +1,31 @@
+Index: qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+===================================================================
+--- qt4-x11.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-08-12 12:11:14.347910382 +0800
++++ qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-08-12 12:23:03.523930163 +0800
+@@ -189,6 +189,16 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+
++/* CPU(MIPS64) - MIPS 64-bit both BIG and LITTLE endian */
++#if (_MIPS_SIM == _ABI64)
++#define WTF_CPU_MIPS64 1
++#endif
++
++/* CPU(MIPSN32) - MIPS N32 ABI both BIG and LITTLE endian */
++#if (_MIPS_SIM == _ABIN32)
++#define WTF_CPU_MIPSN32 1
++#endif
++
+ /* CPU(S390X) - S390 64-bit */
+ #if defined(__s390x__)
+ #define WTF_CPU_S390X 1
+@@ -885,7 +895,8 @@
+ #endif
+
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) \
++ || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) || CPU(MIPS64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
diff --git a/debian/patches/series b/debian/patches/series
index 7b0b9c6..02dfe96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ s390x_jscore.diff
add_missing_method_for_QBasicAtomicPointer_on_s390.patch
no_libicu_message.diff
QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+mips64-jscore.diff
diff --git a/debian/rules b/debian/rules
index b8c0700..e04e86b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ else
endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
- ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64))
+ ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el))
platform_arg = linux-g++
else ifeq ($(DEB_HOST_ARCH_BITS),64)
platform_arg = linux-g++-64
Reply to: