rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build and disable JIT on aarch64

Browse Source
This commit is contained in:
Peter Robinson 2014-03-23 13:31:10 +00:00
parent a5c3f10fc5
commit 16c033b57b
3 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.gitignore vendored
View File

@ -1,35 +1 @@
webkit-1.3.2.tar.gz
/webkit-1.3.3.tar.gz
/webkit-1.3.4.tar.gz
/webkit-1.3.5.tar.gz
/webkit-1.3.6.tar.gz
/webkit-1.3.9.tar.gz
/webkit-1.3.10.tar.gz
/webkit-1.3.11.tar.gz
/webkit-1.3.12.tar.gz
/webkit-1.3.13.tar.gz
/webkit-1.4.0.tar.gz
/webkit-1.4.1.tar.gz
/webkit-1.4.2.tar.gz
/webkit-1.4.3.tar.gz
/webkit-1.6.1.tar.gz
/webkit-1.6.3.tar.xz
/webkitgtk-1.8.0-1.fc18.src.rpm
/webkit-1.8.0.tar.xz
/webkit-1.8.1.tar.xz
/webkit-1.8.2.tar.xz
/webkit-1.8.3.tar.xz
/webkitgtk-1.10.0.tar.xz
/webkitgtk-1.10.1.tar.xz
/webkitgtk-1.10.2.tar.xz
/webkitgtk-2.0.0.tar.xz
/webkitgtk-2.0.1.tar.xz
/webkitgtk-2.0.2.tar.xz
/webkitgtk-2.0.4.tar.xz
/webkitgtk-2.2.0.tar.xz
/webkitgtk-2.2.1.tar.xz
/webkitgtk-2.2.2.tar.xz
/webkitgtk-2.2.3.tar.xz
/webkitgtk-2.2.4.tar.xz
/webkitgtk-2.2.5.tar.xz
/webkitgtk-2.2.6.tar.xz
/webkitgtk-*.tar.xz

47
webkitgtk-aarch64.patch Normal file
View File

@ -0,0 +1,47 @@
--- webkitgtk-2.2.6/Source/WTF/wtf/Platform.h.orig 2014-03-23 11:18:38.543239536 +0000
+++ webkitgtk-2.2.6/Source/WTF/wtf/Platform.h 2014-03-23 11:29:55.273118089 +0000
@@ -327,6 +327,14 @@
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
+/* CPU(AARCH64) - AArch64 */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#if defined(__AARCH64BE__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+#endif
+
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
virtual memory, not to choose a GUI toolkit ==== */
@@ -689,7 +697,8 @@
|| CPU(ALPHA) \
|| CPU(SPARC64) \
|| CPU(S390X) \
- || CPU(PPC64)
+ || CPU(PPC64) \
+ || CPU(AARCH64)
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
@@ -855,7 +864,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT))
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) && !CPU(AARCH64) && !CPU(PPC)
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */
--- webkitgtk-2.2.6/Source/WTF/wtf/dtoa/utils.h.orig 2014-03-23 11:19:58.494529128 +0000
+++ webkitgtk-2.2.6/Source/WTF/wtf/dtoa/utils.h 2014-03-23 11:31:19.284463063 +0000
@@ -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) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(HPPA) || CPU(AARCH64)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)

9
webkitgtk.spec
View File

@ -10,7 +10,7 @@
Name: webkitgtk
Version: 2.2.6
Release: 1%{?dist}
Release: 2%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@ -26,6 +26,7 @@ Patch0: webkit-1.3.10-nspluginwrapper.patch
Patch1: webkitgtk-2.1.1-yarr.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128
Patch4: webkit-2.1.90-double2intsPPC32.patch
Patch10: webkitgtk-aarch64.patch
BuildRequires: bison
BuildRequires: chrpath
@ -93,6 +94,7 @@ This package contains developer documentation for %{name}.
%ifarch ppc s390
%patch4 -p1 -b .double2intsPPC32
%endif
%patch10 -p1 -b .aarch64
%build
%ifarch s390 %{arm} ppc
@ -116,7 +118,7 @@ This package contains developer documentation for %{name}.
CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
--with-gtk=2.0 \
--disable-webkit2 \
%ifarch s390 s390x ppc ppc64
%ifarch s390 s390x ppc ppc64 aarch64
--disable-jit \
%else
--enable-jit \
@ -201,6 +203,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/webkitgtk
%changelog
* Sat Mar 22 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.2.6-2
- Fix build and disable JIT on aarch64
* Wed Mar 19 2014 Tomas Popela <tpopela@redhat.com> 2.2.6-1
- Update to 2.2.6