From 215e81d2859926ec05fc197573b90ac3fea89019 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 10:03:41 +0000 Subject: qtscript: add patches to meta-qt5 fork Signed-off-by: Martin Jansa --- ...nclude-asm-sgidefs.h-on-non-glibc-systems.patch | 36 ---------------------- ...nclude-asm-sgidefs.h-on-non-glibc-systems.patch | 36 ++++++++++++++++++++++ recipes-qt/qt5/qtscript_git.bb | 9 ++++-- 3 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch create mode 100644 recipes-qt/qt5/qtscript/0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch 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 deleted file mode 100644 index 40dfa97b..00000000 --- a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c10293d932c63b36eac8a1e18756068f218a044a Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 - ^~~~~~~~~~~ -compilation terminated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - 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 00caa6d..485ec25 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 -+#else -+#include -+#endif - #if defined(__MIPSEB__) - #define WTF_CPU_BIG_ENDIAN 1 - #endif 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 +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 + ^~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + 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 ++#else ++#include ++#endif + #if defined(__MIPSEB__) + #define WTF_CPU_BIG_ENDIAN 1 + #endif 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 = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch \ - file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ - " +# Patches from https://github.com/meta-qt5/qtscript/commits/b5.11 +# 5.11.meta-qt5.1 +SRC_URI += " \ + file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch \ + file://0002-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ +" # qemuarm build fails with: # /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)': -- cgit v1.2.3