summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qtscript.inc12
-rw-r--r--recipes-qt/qt5/qtwebkit.inc6
2 files changed, 18 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc
index e7b5d745..5a534f0d 100644
--- a/recipes-qt/qt5/qtscript.inc
+++ b/recipes-qt/qt5/qtscript.inc
@@ -1,5 +1,17 @@
1require qt5.inc 1require qt5.inc
2 2
3# qemuarm build fails with:
4# /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)':
5#/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:106:58: warning: cast from 'char*' to 'int64_t* {aka long long int*}' increases required alignment of target type [-Wcast-align]
6# *reinterpret_cast<int64_t*>(&m_buffer[m_size]) = value;
7# ^
8#{standard input}: Assembler messages:
9#{standard input}:22: Error: selected processor does not support Thumb mode `stmdb sp!,{r1-r3}'
10#{standard input}:23: Error: selected processor does not support Thumb mode `stmdb sp!,{r4-r8,lr}'
11#{standard input}:30: Error: lo register required -- `ldmia sp!,{r4-r8,lr}'
12#{standard input}:43: Error: lo register required -- `ldmia sp!,{r4-r8,lr}'
13ARM_INSTRUCTION_SET = "arm"
14
3# There are no LGPLv3-only licensed files in this component. 15# There are no LGPLv3-only licensed files in this component.
4# Note that some files are LGPL-2.1 only without Digia-Qt-LGPL-Exception-1.1. 16# Note that some files are LGPL-2.1 only without Digia-Qt-LGPL-Exception-1.1.
5DEPENDS += "qtbase" 17DEPENDS += "qtbase"
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index 88df4c81..1027b4c9 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -8,6 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
8 8
9DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveldb" 9DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveldb"
10 10
11# qemuarm build fails with:
12# | {standard input}: Assembler messages:
13# | {standard input}:106: Error: invalid immediate: 983040 is out of range
14# | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146
15ARM_INSTRUCTION_SET = "arm"
16
11SRC_URI += "\ 17SRC_URI += "\
12 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 18 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
13 file://0002-Remove-TEXTREL-tag-in-x86.patch \ 19 file://0002-Remove-TEXTREL-tag-in-x86.patch \