t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-06 22:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5-creator: Fix building botan for all non-x86 arches

Browse Source 
The original fix was just for x86/x86_64

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-08-24 07:32:09 +00:00
committed by Martin Jansa
parent 85e665b158
commit 189dd8ab10
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
recipes-qt/qt5/qt5-creator/botan-non-x86.patch Normal file
View File

@@ -0,0 +1,19 @@
Just check for x86 or x86_64 to define X86 based support
This makes sure it compiles for non-x86 platforms
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: qt-creator-opensource-src-4.5.1/src/libs/3rdparty/botan/botan.h
===================================================================
--- qt-creator-opensource-src-4.5.1.orig/src/libs/3rdparty/botan/botan.h
+++ qt-creator-opensource-src-4.5.1/src/libs/3rdparty/botan/botan.h
@@ -85,7 +85,7 @@
#endif
#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
-#if !defined(__arm__) && !defined(__aarch64__)
+#if defined(__i386__) || defined(__x86_64__)
#define BOTAN_TARGET_CPU_IS_X86_FAMILY
#endif
#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1

1
recipes-qt/qt5/qt5-creator_4.5.1.bb
View File

@@ -22,6 +22,7 @@ DEPENDS_append_libc-musl = " libexecinfo"
SRC_URI = " \
http://download.qt.io/official_releases/qtcreator/4.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \
file://botan-non-x86.patch \
file://qtcreator.desktop.in \
"
SRC_URI_append_libc-musl = " file://0002-Link-with-libexecinfo-on-musl.patch"