diff options
| author |   Luke Dashjr <luke-jr+git@utopios.org> | 2015-10-25 05:02:59 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2015-10-25 09:33:55 +0000 |
| commit | c26112a10cbb998a726cfeda54403f8af5cd5eca (patch) | |
| tree | 57eae1f43527e5677da6f1f77648a7eb1d36eb61 /dev-qt | |
| parent | gnome-extra/zeitgeist: Add back dev-python/rdflib dependency (diff) | |
| download | gentoo-c26112a10cbb998a726cfeda54403f8af5cd5eca.tar.gz gentoo-c26112a10cbb998a726cfeda54403f8af5cd5eca.tar.bz2 gentoo-c26112a10cbb998a726cfeda54403f8af5cd5eca.zip | |
dev-qt/qtscript: Restore x32 compatibility patch
No revbump because the build failed in the only cases this patch matters (x32 target).
Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch | 53 | ||||
| -rw-r--r-- | dev-qt/qtscript/qtscript-4.8.6-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-qt/qtscript/qtscript-4.8.7.ebuild | 2 |
3 files changed, 57 insertions, 0 deletions
diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch new file mode 100644 index 000000000000..cde4cfb93f51 --- /dev/null +++ b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch @@ -0,0 +1,53 @@ +From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Tue, 4 Mar 2014 10:46:18 +0100 +Subject: Fix build on x32 + +Recognize x32 and disable JIT in this configuration. + +Task-number: QTBUG-35463 +Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 0b95639..85ed8a7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -202,6 +202,11 @@ + #if defined(__x86_64__) \ + || defined(_M_X64) + #define WTF_CPU_X86_64 1 ++ ++#if defined(__ILP32__) ++#define WTF_CPU_X32 1 ++#endif ++ + #endif + + /* 64-bit mode on AIX */ +@@ -906,7 +911,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#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) ++#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) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 +@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ + #define ENABLE_REPAINT_THROTTLING 0 + #endif + ++/* Disable JIT on x32 */ ++#if CPU(X32) ++#define ENABLE_JIT 0 ++#endif ++ + #if !defined(ENABLE_JIT) + + /* The JIT is tested & working on x86_64 Mac */ +-- +cgit v0.11.0 + diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild index 14d3497298c8..db626e8332b9 100644 --- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild +++ b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild @@ -26,6 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script" QCONFIG_ADD="script" QCONFIG_DEFINE="QT_SCRIPT" +PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) + multilib_src_configure() { local myconf=( $(qt_use jit javascript-jit) diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild index fdb078711d2a..e8addd703872 100644 --- a/dev-qt/qtscript/qtscript-4.8.7.ebuild +++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild @@ -23,6 +23,8 @@ QT4_TARGET_DIRECTORIES="src/script" QCONFIG_ADD="script" QCONFIG_DEFINE="QT_SCRIPT" +PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) + multilib_src_configure() { local myconf=( $(qt_use jit javascript-jit) |