diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 10:03:41 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-19 09:55:34 +0000 |
commit | 215e81d2859926ec05fc197573b90ac3fea89019 (patch) | |
tree | a2398d125bd6cfe428307f5160f4418999333080 | |
parent | 66a9704223e327d2f89093367a7967f3efc994e6 (diff) | |
download | meta-qt5-215e81d2859926ec05fc197573b90ac3fea89019.tar.gz |
qtscript: add patches to meta-qt5 fork
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch (renamed from recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch) | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch index 40dfa97b..9a307478 100644 --- a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch +++ b/recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c10293d932c63b36eac8a1e18756068f218a044a Mon Sep 17 00:00:00 2001 | 1 | From b7517ed7b952f696ae8206b1b68e47a1f1a9d020 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 23 Aug 2018 02:58:14 +0000 | 3 | Date: Thu, 23 Aug 2018 02:58:14 +0000 |
4 | Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems | 4 | Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems |
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 1 file changed, 4 insertions(+) | 19 | 1 file changed, 4 insertions(+) |
20 | 20 | ||
21 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 21 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
22 | index 00caa6d..485ec25 100644 | 22 | index 96942c7..f828f04 100644 |
23 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 23 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
24 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 24 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |
25 | @@ -377,7 +377,11 @@ | 25 | @@ -377,7 +377,11 @@ |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 17ee1130..c430dc6e 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -11,9 +11,12 @@ 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 | # Patches from https://github.com/meta-qt5/qtscript/commits/b5.11 |
15 | file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ | 15 | # 5.11.meta-qt5.1 |
16 | " | 16 | SRC_URI += " \ |
17 | file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch \ | ||
18 | file://0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ | ||
19 | " | ||
17 | 20 | ||
18 | # qemuarm build fails with: | 21 | # qemuarm build fails with: |
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)': | 22 | # /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)': |