Attachment 689974 Details for Bug 905593 – proposed patch

[patch] proposed patch

0001-fix-disable-jit-builds.patch (text/plain), 3.06 KB, created by Karsten Hopp on 2013-01-29 17:53:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karsten Hopp

Created: 2013-01-29 17:53:37 UTC

Size: 3.06 KB

patch

obsolete

>From c92fc46bbce5401c5314d75717b16db17c5d8175 Mon Sep 17 00:00:00 2001
>From: Karsten Hopp <karsten@redhat.com>
>Date: Tue, 29 Jan 2013 18:35:52 +0100
>Subject: [PATCH] fix --disable-jit builds
>
>---
> webkitgtk-1.11.4-nojit.patch | 28 ++++++++++++++++++++++++++++
> webkitgtk3.spec              |  7 ++++++-
> 2 files changed, 34 insertions(+), 1 deletion(-)
> create mode 100644 webkitgtk-1.11.4-nojit.patch
>
>diff --git a/webkitgtk-1.11.4-nojit.patch b/webkitgtk-1.11.4-nojit.patch
>new file mode 100644
>index 0000000..f3b2746
>--- /dev/null
>+++ b/webkitgtk-1.11.4-nojit.patch
>@@ -0,0 +1,28 @@
>+diff -up webkitgtk-1.11.4/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp.nojit webkitgtk-1.11.4/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp
>+--- webkitgtk-1.11.4/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp.nojit	2013-01-09 16:48:06.000000000 +0100
>++++ webkitgtk-1.11.4/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp	2013-01-29 16:55:54.007935743 +0100
>+@@ -76,8 +76,11 @@ Intrinsic CallLinkStatus::intrinsicFor(C
>+ {
>+     if (!m_executable)
>+         return NoIntrinsic;
>+-    
>++#if ENABLE(JIT) 
>+     return m_executable->intrinsicFor(kind);
>++#else
>++    return NoIntrinsic;
>++#endif
>+ }
>+ 
>+ CallLinkStatus CallLinkStatus::computeFromLLInt(CodeBlock* profiledBlock, unsigned bytecodeIndex)
>+diff -up webkitgtk-1.11.4/Source/JavaScriptCore/runtime/Executable.cpp.nojit webkitgtk-1.11.4/Source/JavaScriptCore/runtime/Executable.cpp
>+--- webkitgtk-1.11.4/Source/JavaScriptCore/runtime/Executable.cpp.nojit	2013-01-29 17:49:19.173186518 +0100
>++++ webkitgtk-1.11.4/Source/JavaScriptCore/runtime/Executable.cpp	2013-01-29 17:57:08.101882481 +0100
>+@@ -67,7 +67,7 @@ Intrinsic ExecutableBase::intrinsic() co
>+         return nativeExecutable->intrinsic();
>+     return NoIntrinsic;
>+ }
>+-#else
>++#elif ENABLE(JIT)
>+ Intrinsic ExecutableBase::intrinsic() const
>+ {
>+     return NoIntrinsic;
>diff --git a/webkitgtk3.spec b/webkitgtk3.spec
>index f250b83..f478985 100644
>--- a/webkitgtk3.spec
>+++ b/webkitgtk3.spec
>@@ -7,7 +7,7 @@
> 
> Name:           webkitgtk3
> Version:        1.11.4
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        GTK+ Web content engine library
> 
> Group:          Development/Libraries
>@@ -29,6 +29,7 @@ Patch6:         webkit-1.11.2-Double2Ints.patch
> Patch7:         webkitgtk-1.11.4-AccessibilityTableCell-crash.patch
> # https://bugs.webkit.org/show_bug.cgi?id=108032
> Patch8:         webkitgtk-1.11.4-icu-cppflags.patch
>+Patch9:         webkitgtk-1.11.4-nojit.patch
> 
> BuildRequires:  bison
> BuildRequires:  cairo-devel
>@@ -97,6 +98,7 @@ This package contains developer documentation for %{name}.
> %patch6 -p1 -b .double2ints
> %patch7 -p1 -b .AccessibilityTableCell
> %patch8 -p1 -b .icu_cppflags
>+%patch9 -p1 -b .nojit
> 
> # For patch8
> autoreconf --verbose --install -I Source/autotools
>@@ -218,6 +220,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
> 
> 
> %changelog
>+* Tue Jan 29 2013 Karsten Hopp <karsten@redhat.com> 1.11.4-5
>+- fix build on non-JIT archs
>+
> * Sat Jan 26 2013 Kalev Lember <kalevlember@gmail.com> - 1.11.4-4
> - Rebuilt for icu 50
> 
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 905593: 689972 | 689974