fix build on s390(x)

This commit is contained in:
Dan Horák 2011-10-12 20:17:01 +02:00
parent 682a09b85a
commit 96d6f523ba
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
--- webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa 2011-10-12 15:28:33.000000000 +0200
+++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-12 15:28:52.000000000 +0200
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)

View File

@ -35,7 +35,7 @@
Name: webkitgtk
Version: 1.6.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release}
@ -55,6 +55,8 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
## bug. :)
Patch1: webkit-1.3.12-no-execmem.patch
Patch2: webkit-1.3.10-nspluginwrapper.patch
# https://bugs.webkit.org/show_bug.cgi?id=69940
Patch3: webkit-1.6.1-dtoa-s390.patch
BuildRequires: bison
BuildRequires: chrpath
@ -118,6 +120,7 @@ LICENSE, README, and AUTHORS files.
%setup -qn "webkit-%{version}"
%patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper
%patch3 -p1 -b .dtoa-s390
%build
%ifarch s390
@ -207,6 +210,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_docdir}/%{name}-%{version}/
%changelog
* Wed Oct 12 2011 Dan Horák <dan[at]danny.cz> - 1.6.1-2
- fix build on s390(x)
* Tue Sep 27 2011 Kevin Fenzi <kevin@scrye.com> - 1.6.1-1
- Update to 1.6.1