diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-23 03:01:37 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-19 09:55:34 +0000 |
commit | 66a9704223e327d2f89093367a7967f3efc994e6 (patch) | |
tree | 1873b43ebdfb71558557186f842c2e4d47c9857c | |
parent | edf1e434942d3169c459eedaf1d7736ab51ac07a (diff) | |
download | meta-qt5-66a9704223e327d2f89093367a7967f3efc994e6.tar.gz |
qtscript: Fix build on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch | 36 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 4 |
2 files changed, 39 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch new file mode 100644 index 00000000..40dfa97b --- /dev/null +++ b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From c10293d932c63b36eac8a1e18756068f218a044a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 23 Aug 2018 02:58:14 +0000 | ||
4 | Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems | ||
5 | |||
6 | sgidefs.h wrapper is glibc specific and causes build | ||
7 | failures on musl | ||
8 | |||
9 | Fixes | ||
10 | Platform.h:380:10: fatal error: sgidefs.h: No such file or directory | ||
11 | #include <sgidefs.h> | ||
12 | ^~~~~~~~~~~ | ||
13 | compilation terminated. | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
22 | index 00caa6d..485ec25 100644 | ||
23 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
24 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
25 | @@ -377,7 +377,11 @@ | ||
26 | |||
27 | #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) | ||
28 | #define WTF_CPU_MIPS 1 | ||
29 | +#if defined(__GLIBC__) | ||
30 | #include <sgidefs.h> | ||
31 | +#else | ||
32 | +#include <asm/sgidefs.h> | ||
33 | +#endif | ||
34 | #if defined(__MIPSEB__) | ||
35 | #define WTF_CPU_BIG_ENDIAN 1 | ||
36 | #endif | ||
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 4f18ffd0..17ee1130 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = " \ | |||
11 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 11 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch" | 14 | SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch \ |
15 | file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ | ||
16 | " | ||
15 | 17 | ||
16 | # qemuarm build fails with: | 18 | # qemuarm build fails with: |
17 | # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': | 19 | # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': |