diff options
Diffstat (limited to 'recipes-qt/qt5/qtscript')
-rw-r--r-- | recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch | 5 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch | 36 |
2 files changed, 37 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch index 878a8ab9..94f03a31 100644 --- a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch +++ b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch @@ -1,4 +1,4 @@ -From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001 +From a67b00eb05abcb5242ee21049400a1e4a033389f Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Wed, 18 Jul 2018 14:26:21 -0700 Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support @@ -45,6 +45,3 @@ index 00caa6d..96942c7 100644 #define WTF_USE_JSVALUE32 1 #elif OS(WINDOWS) && COMPILER(MINGW) /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg --- -2.17.1 - diff --git a/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch new file mode 100644 index 00000000..9a307478 --- /dev/null +++ b/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch @@ -0,0 +1,36 @@ +From b7517ed7b952f696ae8206b1b68e47a1f1a9d020 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Aug 2018 02:58:14 +0000 +Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems + +sgidefs.h wrapper is glibc specific and causes build +failures on musl + +Fixes +Platform.h:380:10: fatal error: sgidefs.h: No such file or directory + #include <sgidefs.h> + ^~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 96942c7..f828f04 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -377,7 +377,11 @@ + + #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) + #define WTF_CPU_MIPS 1 ++#if defined(__GLIBC__) + #include <sgidefs.h> ++#else ++#include <asm/sgidefs.h> ++#endif + #if defined(__MIPSEB__) + #define WTF_CPU_BIG_ENDIAN 1 + #endif |