diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch | |
parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch')
-rw-r--r-- | recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch index 3ed8bc45..c4ee34bf 100644 --- a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch +++ b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch @@ -1,7 +1,7 @@ -From 748174788b318c6316e6d41ce323306120223e02 Mon Sep 17 00:00:00 2001 +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 1/2] Fix: Allow qt-creator to build on arm aarch32 and aarch64 +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. @@ -14,7 +14,7 @@ Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp -index b7a9ddf..c5b9826 100644 +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 @@ -76,10 +76,10 @@ index b7a9ddf..c5b9826 100644 * Helper Macros for x86 Assembly */ diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h -index 2981d2c..1c8d828 100644 +index 2caa4a3..39b8079 100644 --- a/src/libs/3rdparty/botan/botan.h +++ b/src/libs/3rdparty/botan/botan.h -@@ -82,7 +82,9 @@ +@@ -85,7 +85,9 @@ #endif #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN @@ -89,6 +89,3 @@ index 2981d2c..1c8d828 100644 #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ --- -1.8.3.1 - |