4 files changed, 108 insertions, 93 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
deleted file mode 100644
index 28dc4755..00000000
--- a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 231e0cf0c764d3b63cd5ec788ac0ee901b47fc8e 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 87736d5..2e950d8 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 d7b90cc..26ca8ac 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) || \
diff --git a/recipes-qt/qt5/qt5-creator/0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch b/recipes-qt/qt5/qt5-creator/0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch
new file mode 100644
index 00000000..eebda742
--- /dev/null
+++ b/recipes-qt/qt5/qt5-creator/0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch
@@ -0,0 +1,26 @@
+From 766e5b37a42b440b66823262eb553f9981940115 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 27 Sep 2018 20:48:17 -0700
+Subject: [PATCH] botan: Always define BOTAN_ARCH_SWITCH when cross-building
+
+this helps in compiling botan for non-x86 architectures
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/libs/botan/botan.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libs/botan/botan.pro b/src/libs/botan/botan.pro
+index 0c939b2a30..6e1a85fe84 100644
+--- a/src/libs/botan/botan.pro
++++ b/src/libs/botan/botan.pro
+@@ -18,6 +18,7 @@ else: clang: BOTAN_CC_TYPE = clang
+ else: BOTAN_CC_TYPE = gcc
+ contains(QT_ARCH, i386): BOTAN_ARCH_SWITCH = "--cpu=x86"
+ else: contains(QT_ARCH, x86_64): BOTAN_ARCH_SWITCH = "--cpu=x86_64"
++else: BOTAN_ARCH_SWITCH = --cpu=$$QT_ARCH
+ BOTAN_MODULES = aes aes_ssse3 auto_rng bigint block cbc ctr des dh dsa ec_group ecdh ecdsa entropy \
+                 filters hmac mode_pad pubkey rsa sha1 sha1_sse2 sha1_x86 sha2_32 sha2_32_x86 \
+                 sha2_64 simd system_rng,emsa_pkcs1,pbes2,pbkdf2
+-- 2.19.0
+
diff --git a/recipes-qt/qt5/qt5-creator/0002-botan.pro-pass-QMAKE_AR.patch b/recipes-qt/qt5/qt5-creator/0002-botan.pro-pass-QMAKE_AR.patch
new file mode 100644
index 00000000..26262299
--- /dev/null
+++ b/recipes-qt/qt5/qt5-creator/0002-botan.pro-pass-QMAKE_AR.patch
@@ -0,0 +1,80 @@
+From cd006f4a79b3c1435a8a8321b5af9191f104bbb3 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 26 Sep 2018 21:14:06 +0000
+Subject: [PATCH] botan.pro: pass QMAKE_AR
+
+* otherwise AR from environment sets it with cqs params, e.g.:
+  x86_64-oe-linux-ar cqs
+  from QMAKE_AR = ${OE_QMAKE_AR} cqs
+
+  but then botan's Makefile will add "crs" after it causing:
+  http://errors.yoctoproject.org/Errors/Details/194653/
+
+  x86_64-oe-linux-ar cqs crs libbotan-2.a build/obj/lib/botan_all.o build/obj/lib/botan_all_ssse3.o
+  x86_64-oe-linux-ar: libbotan-2.a: No such file or directory
+  Makefile:79: recipe for target 'libbotan-2.a' failed
+  make[4]: *** [libbotan-2.a] Error 1
+
+* add --ar-options parameter to botan configure and respect the
+  value when set (before cc.ar_options and osinfo.ar_options)
+  then use this to pass empty ar_options as we already include
+  the options in ar_command
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/libs/3rdparty/botan/configure.py | 13 ++++++++++++-
+ src/libs/botan/botan.pro             |  1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/libs/3rdparty/botan/configure.py b/src/libs/3rdparty/botan/configure.py
+index b09f07bb5e..2b5b9c6417 100755
+--- a/src/libs/3rdparty/botan/configure.py
++++ b/src/libs/3rdparty/botan/configure.py
+@@ -321,6 +321,9 @@ def process_command_line(args): # pylint: disable=too-many-locals
+     target_group.add_option('--ar-command', dest='ar_command', metavar='AR', default=None,
+                             help='set path to static archive creator')
+ 
++    target_group.add_option('--ar-options', dest='ar_options', metavar='crs', default='crs',
++                            help='set options for static archive creator')
++
+     target_group.add_option('--msvc-runtime', metavar='RT', default=None,
+                             help='specify MSVC runtime (MT, MD, MTd, MDd)')
+ 
+@@ -1786,6 +1789,14 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
+ 
+         return osinfo.ar_command
+ 
++    def ar_options():
++        if options.ar_options:
++            return options.ar_options
++        if cc.ar_options:
++            return cc.ar_options
++
++        return osinfo.ar_options
++
+     def choose_endian(arch_info, options):
+         if options.with_endian != None:
+             return options.with_endian
+@@ -1938,7 +1949,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
+         'post_link_cmd': '',
+ 
+         'ar_command': ar_command(),
+-        'ar_options': cc.ar_options or osinfo.ar_options,
++        'ar_options': ar_options(),
+         'ar_output_to': cc.ar_output_to,
+ 
+         'link_to': ' '.join(
+diff --git a/src/libs/botan/botan.pro b/src/libs/botan/botan.pro
+index 0c939b2a30..e8082c4bbb 100644
+--- a/src/libs/botan/botan.pro
++++ b/src/libs/botan/botan.pro
+@@ -46,6 +46,7 @@ configure.variable_out = BOTAN_MAKEFILE
+ configure.commands = cd $$BOTAN_BUILD_DIR_FOR_SHELL && \
+                      python $$CONFIGURE_FILE_PATH_FOR_SHELL \
+                      --cc=$$BOTAN_CC_TYPE --cc-bin=$$shell_quote($$QMAKE_CXX) \
++                     --ar-command=$$shell_quote($$QMAKE_AR) --ar-options=$$shell_quote(' ') \
+                      $$BOTAN_ARCH_SWITCH $$BOTAN_OS_SWITCH $$OTHER_FLAGS
+ QMAKE_EXTRA_COMPILERS += configure
+ 
diff --git a/recipes-qt/qt5/qt5-creator/0002-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch
index 40e277fe..9b225a57 100644
--- a/recipes-qt/qt5/qt5-creator/0002-Link-with-libexecinfo-on-musl.patch
+++ b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch
@@ -1,4 +1,4 @@
-From a30f4335d49516eb4654111af5bf073b633f7336 Mon Sep 17 00:00:00 2001
+From 88afa7173c7d0c97e15d9ee9c58e8c0364799bb7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 16 Jan 2018 13:26:57 +0000
 Subject: [PATCH] Link with libexecinfo on musl
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
-index f5a34aa..4a1359d 100644
+index f5a34aa0d5..4a1359dd5c 100644
 --- a/src/plugins/debugger/debugger.pro
 +++ b/src/plugins/debugger/debugger.pro
 @@ -141,3 +141,4 @@ include(console/console.pri)