| 1 |
commit: c26112a10cbb998a726cfeda54403f8af5cd5eca |
| 2 |
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org> |
| 3 |
AuthorDate: Sun Oct 25 05:02:59 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 25 09:33:55 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26112a1 |
| 7 |
|
| 8 |
dev-qt/qtscript: Restore x32 compatibility patch |
| 9 |
|
| 10 |
No revbump because the build failed in the only cases this patch matters (x32 target). |
| 11 |
|
| 12 |
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org> |
| 13 |
|
| 14 |
.../qtscript/files/4.8.6-javascriptcore-x32.patch | 53 ++++++++++++++++++++++ |
| 15 |
dev-qt/qtscript/qtscript-4.8.6-r2.ebuild | 2 + |
| 16 |
dev-qt/qtscript/qtscript-4.8.7.ebuild | 2 + |
| 17 |
3 files changed, 57 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..cde4cfb |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch |
| 24 |
@@ -0,0 +1,53 @@ |
| 25 |
+From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Allan Sandfeld Jensen <allan.jensen@×××××.com> |
| 27 |
+Date: Tue, 4 Mar 2014 10:46:18 +0100 |
| 28 |
+Subject: Fix build on x32 |
| 29 |
+ |
| 30 |
+Recognize x32 and disable JIT in this configuration. |
| 31 |
+ |
| 32 |
+Task-number: QTBUG-35463 |
| 33 |
+Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e |
| 34 |
+--- |
| 35 |
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++- |
| 36 |
+ 1 file changed, 11 insertions(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
| 39 |
+index 0b95639..85ed8a7 100644 |
| 40 |
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
| 41 |
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
| 42 |
+@@ -202,6 +202,11 @@ |
| 43 |
+ #if defined(__x86_64__) \ |
| 44 |
+ || defined(_M_X64) |
| 45 |
+ #define WTF_CPU_X86_64 1 |
| 46 |
++ |
| 47 |
++#if defined(__ILP32__) |
| 48 |
++#define WTF_CPU_X32 1 |
| 49 |
++#endif |
| 50 |
++ |
| 51 |
+ #endif |
| 52 |
+ |
| 53 |
+ /* 64-bit mode on AIX */ |
| 54 |
+@@ -906,7 +911,7 @@ |
| 55 |
+ #endif |
| 56 |
+ |
| 57 |
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) |
| 58 |
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) |
| 59 |
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) |
| 60 |
+ #define WTF_USE_JSVALUE64 1 |
| 61 |
+ #elif CPU(ARM) || CPU(PPC64) |
| 62 |
+ #define WTF_USE_JSVALUE32 1 |
| 63 |
+@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ |
| 64 |
+ #define ENABLE_REPAINT_THROTTLING 0 |
| 65 |
+ #endif |
| 66 |
+ |
| 67 |
++/* Disable JIT on x32 */ |
| 68 |
++#if CPU(X32) |
| 69 |
++#define ENABLE_JIT 0 |
| 70 |
++#endif |
| 71 |
++ |
| 72 |
+ #if !defined(ENABLE_JIT) |
| 73 |
+ |
| 74 |
+ /* The JIT is tested & working on x86_64 Mac */ |
| 75 |
+-- |
| 76 |
+cgit v0.11.0 |
| 77 |
+ |
| 78 |
|
| 79 |
diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild |
| 80 |
index 14d3497..db626e8 100644 |
| 81 |
--- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild |
| 82 |
+++ b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild |
| 83 |
@@ -26,6 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script" |
| 84 |
QCONFIG_ADD="script" |
| 85 |
QCONFIG_DEFINE="QT_SCRIPT" |
| 86 |
|
| 87 |
+PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) |
| 88 |
+ |
| 89 |
multilib_src_configure() { |
| 90 |
local myconf=( |
| 91 |
$(qt_use jit javascript-jit) |
| 92 |
|
| 93 |
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild |
| 94 |
index fdb0787..e8addd7 100644 |
| 95 |
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild |
| 96 |
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild |
| 97 |
@@ -23,6 +23,8 @@ QT4_TARGET_DIRECTORIES="src/script" |
| 98 |
QCONFIG_ADD="script" |
| 99 |
QCONFIG_DEFINE="QT_SCRIPT" |
| 100 |
|
| 101 |
+PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) |
| 102 |
+ |
| 103 |
multilib_src_configure() { |
| 104 |
local myconf=( |
| 105 |
$(qt_use jit javascript-jit) |
Archives