- Fix build on s390(x)

This commit is contained in:
Dan Horák 2010-07-20 19:23:38 +00:00
parent e574fc5139
commit 1961b3a7e2
2 changed files with 36 additions and 1 deletions

30
webkit-1.3.1-s390.patch Normal file
View File

@ -0,0 +1,30 @@
diff -up webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 webkit-1.3.1/JavaScriptCore/wtf/Platform.h
--- webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 2010-05-24 15:53:11.000000000 +0200
+++ webkit-1.3.1/JavaScriptCore/wtf/Platform.h 2010-06-14 15:24:18.000000000 +0200
@@ -178,6 +178,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) \
@@ -899,6 +911,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)

View File

@ -35,7 +35,7 @@
Name: webkitgtk
Version: 1.3.2
Release: 3%{?dist}
Release: 4%{?dist}
Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release}
@ -55,6 +55,7 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
## bug. :)
#Patch1: webkit-1.1.13-no-execmem.patch
Patch2: webkit-1.1.14-nspluginwrapper.patch
Patch3: webkit-1.3.1-s390.patch
BuildRequires: bison
BuildRequires: chrpath
@ -117,6 +118,7 @@ LICENSE, README, and AUTHORS files.
%setup -qn "webkit-%{version}"
# %patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper
%patch3 -p1 -b .s390
%build
CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
@ -201,6 +203,9 @@ rm -rf %{buildroot}
%changelog
* Tue Jul 20 2010 Dan Horák <dan[at]danny.cz> - 1.3.2-4
- Fix build on s390(x)
* Thu Jul 15 2010 Colin Walters <walters@verbum.org> - 1.3.2-3
- Rebuild with new gobject-introspection