Package: qtwebkit Version: 5 Severity: important Tags: patch Justification: fails to build from source User: debian-s...@lists.debian.org Usertags: s390x
qtwebkit 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 qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff --- qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff 2011-08-06 10:14:18.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Add support for s390/s390x architectures +Author: Dan Horák <d...@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 + +--- a/JavaScriptCore/wtf/Platform.h ++++ b/JavaScriptCore/wtf/Platform.h +@@ -186,6 +186,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 1 ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++ + /* CPU(X86) - i386 / x86 32-bit */ + #if defined(__i386__) \ + || defined(i386) \ +@@ -917,6 +929,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_TRADITIONAL) || CPU(PPC64) || CPU(MIPS) diff -Nru qtwebkit-2.1.0~2011week13/debian/patches/series qtwebkit-2.1.0~2011week13/debian/patches/series --- qtwebkit-2.1.0~2011week13/debian/patches/series 2011-06-20 12:57:32.000000000 +0000 +++ qtwebkit-2.1.0~2011week13/debian/patches/series 2011-08-06 10:14:47.000000000 +0000 @@ -8,6 +8,7 @@ 04_enable_debug_information.diff 05_sparc_unaligned_access.diff 06_kfreebsd_strnstr.diff +07_s390x.diff stabs_format_debug_info.diff no_gc_sections.diff 09_hurd.diff diff -Nru qtwebkit-2.1.0~2011week13/debian/rules qtwebkit-2.1.0~2011week13/debian/rules --- qtwebkit-2.1.0~2011week13/debian/rules 2011-04-06 08:34:09.000000000 +0000 +++ qtwebkit-2.1.0~2011week13/debian/rules 2011-08-07 15:01:52.000000000 +0000 @@ -6,7 +6,7 @@ # Filter -g from environment on troublesome arches. Replace it with -gstabs # See also: stabs_format_debug_info.diff DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) -ifneq (,$(filter $(DEB_HOST_ARCH),s390 armel mips mipsel)) +ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel)) export CFLAGS := $(filter-out -g,$(CFLAGS)) -gstabs export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs endif -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: s390x Kernel: 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 -- To UNSUBSCRIBE, email to debian-qt-kde-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110807172246.14007.4713.report...@volta.aurel32.net
