Bug#637227: webkit: FTBFS on s390x: needs some adjustments

[Aurelien Jarno]

Package: webkit
Version: 1.2.7-3
Severity: serious
Tags: patch
Justification: fails to build from source
User: debian-s390 at lists.debian.org
Usertags: s390x

webkit fails to build on s390x, as the code to support this architecture
is not yet present in the package, though it is present in upstream 
webkit. It is easy to backport, so please find below a patch to do that.
The patch also changes the debugging support to -gstabs (similarly to what
is already done on s390), as otherwise the link fails.


diff -Nru webkit-1.2.7/debian/patches/09-s390x-support.patch webkit-1.2.7/debian/patches/09-s390x-support.patch
--- webkit-1.2.7/debian/patches/09-s390x-support.patch	1970-01-01 00:00:00.000000000 +0000
+++ webkit-1.2.7/debian/patches/09-s390x-support.patch	2011-08-08 19:21:00.000000000 +0000
@@ -0,0 +1,37 @@
+Description: Add support for s390/s390x architectures
+Author: Dan Horák <dan at danny.cz> 
+Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
+Forwarded: no
+Last-Update: 2011-08-06
+
+Index: webkit-1.2.7/JavaScriptCore/wtf/Platform.h
+===================================================================
+--- webkit-1.2.7.orig/JavaScriptCore/wtf/Platform.h	2010-09-10 13:20:23.000000000 +0000
++++ webkit-1.2.7/JavaScriptCore/wtf/Platform.h	2011-08-08 19:20:34.449368473 +0000
+@@ -171,6 +171,18 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+ 
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -872,6 +884,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+     || (CPU(IA64) && !CPU(IA64_32)) \
+     || CPU(ALPHA) \
++    || CPU(S390X) \
+     || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS)
diff -Nru webkit-1.2.7/debian/patches/series webkit-1.2.7/debian/patches/series
--- webkit-1.2.7/debian/patches/series	2011-04-28 20:55:46.000000000 +0000
+++ webkit-1.2.7/debian/patches/series	2011-08-08 19:20:20.000000000 +0000
@@ -4,6 +4,7 @@
 06-gir1.2-jscore.patch
 07-fix-bad-merge-that-broke-gifs.patch
 08-fix-crash-for-big-shadowed-areas.patch
+09-s390x-support.patch
 cve-2010-2646.patch
 cve-2010-2651.patch
 cve-2010-2900.patch
diff -Nru webkit-1.2.7/debian/rules webkit-1.2.7/debian/rules
--- webkit-1.2.7/debian/rules	2011-04-28 20:55:46.000000000 +0000
+++ webkit-1.2.7/debian/rules	2011-08-08 19:08:32.000000000 +0000
@@ -18,7 +18,7 @@
         CFLAGS += -Wl,--no-relax
 endif
 
-ifeq ($(DEB_BUILD_ARCH),s390)
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x))
         CFLAGS += -gstabs
 endif
 

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: s390x 

Kernel: Linux 2.6.32-5-s390x (SMP w/3 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash