diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-25 21:03:54 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-24 11:13:28 +0100 |
commit | c44fc9b620f762ce68441f834e1a157288a488e6 (patch) | |
tree | 6d6c8d22c68c02b30e5f9240fa8fe84015e3586d /meta/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch | |
parent | c639a01c7a3ecf1a127fa43fa780fd6328c1367e (diff) | |
download | openembedded-core-contrib-c44fc9b620f762ce68441f834e1a157288a488e6.tar.gz |
qt5: import recipes which often reproduce Yocto #12434 from meta-qt5
* just temporary to make it easier to reproduce, import big part of
meta-qt5
* qtquickcontrols-5.9.5+gitAUTOINC+75e9561d4f-r0 do_package_qa: QA Issue: qtquickcontrols: /qtquickcontrols-qmlplugins/usr/lib/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml is owned by uid 1101, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]
* to reproduce this you can try to use something like this:
export COMP=qtquickcontrols; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c package ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra BUILD/work/i586-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch')
-rw-r--r-- | meta/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/meta/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch new file mode 100644 index 0000000000..c4ee34bf9d --- /dev/null +++ b/meta/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch @@ -0,0 +1,91 @@ +From 056bc88a15df06443a4a6bdea2b1ead045f89bf6 Mon Sep 17 00:00:00 2001 +From: Greg Nietsky <gregory@distrotech.co.za> +Date: Tue, 4 Mar 2014 11:33:40 +0200 +Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64 + +Botan is imported hardwired for x86 this small patch allows it +too operate on arm other platforms could be added. + +Task-number: QTCREATORBUG-8107 +Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a +--- + src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++- + src/libs/3rdparty/botan/botan.h | 2 ++ + 2 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp +index e6a5f22..7b625ac 100644 +--- a/src/libs/3rdparty/botan/botan.cpp ++++ b/src/libs/3rdparty/botan/botan.cpp +@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator + + #if (BOTAN_MP_WORD_BITS != 32) + #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 ++#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) ++typedef Botan::u64bit dword; + #endif + + #ifdef Q_OS_UNIX +@@ -1118,6 +1120,7 @@ extern "C" { + */ + inline word word_madd2(word a, word b, word* c) + { ++#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) + asm( + ASM("mull %[b]") + ASM("addl %[c],%[a]") +@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c) + : "0"(a), "1"(b), [c]"g"(*c) : "cc"); + + return a; ++#else ++ dword z = (dword)a * b + *c; ++ *c = (word)(z >> BOTAN_MP_WORD_BITS); ++ return (word)z; ++#endif + } + + /* +@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c) + */ + inline word word_madd3(word a, word b, word c, word* d) + { ++#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) + asm( + ASM("mull %[b]") + +@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d) + : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); + + return a; ++#else ++ dword z = (dword)a * b + c + *d; ++ *d = (word)(z >> BOTAN_MP_WORD_BITS); ++ return (word)z; ++#endif + } + + } +@@ -2315,7 +2329,7 @@ namespace Botan { + + extern "C" { + +-#ifdef Q_OS_UNIX ++#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) + /* + * Helper Macros for x86 Assembly + */ +diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h +index 2caa4a3..39b8079 100644 +--- a/src/libs/3rdparty/botan/botan.h ++++ b/src/libs/3rdparty/botan/botan.h +@@ -85,7 +85,9 @@ + #endif + + #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN ++#if !defined(__arm__) && !defined(__aarch64__) + #define BOTAN_TARGET_CPU_IS_X86_FAMILY ++#endif + #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 + + #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ |