From a64c9789834fae95498f14debd077b95ac013ef6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 27 Dec 2021 10:52:33 +0200
Subject: [PATCH] Create Conan profile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Generate Conan profiles that can then be used with the SDK.
Task in qtbase generates profile that has all the architecture bits
and configure arguments in place. The profile added in the SDK phase
lets Conan recipes know how to use the SDK with the QT_CONFIGURE_MODULE
environment variable.

Pick-to: 6.3 6.2
Change-Id: I33a9b0f3915417d98ad12559ce7661c92b1cc739
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
---
 classes/populate_sdk_qt6_base.bbclass |  8 +++++
 recipes-qt/qt6/conan.inc              | 52 +++++++++++++++++++++++++++
 recipes-qt/qt6/qtbase_git.bb          |  1 +
 3 files changed, 61 insertions(+)
 create mode 100644 recipes-qt/qt6/conan.inc

diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass
index dafa246..4263afb 100644
--- a/classes/populate_sdk_qt6_base.bbclass
+++ b/classes/populate_sdk_qt6_base.bbclass
@@ -129,6 +129,14 @@ EOF
     # resolve absolute paths at runtime
     sed -i -e 's|${SDKPATH}/sysroots|\${SYSROOTS}|g' \
         ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake
+
+    # Conan profile
+    mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/conan
+    cat > ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/conan/profile <<EOF
+include(${SDKTARGETSYSROOT}${datadir}/conan/profile)
+[env]
+QT_CONFIGURE_MODULE=${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/qt-configure-module
+EOF
 }
 
 # default debug prefix map isn't valid in the SDK
diff --git a/recipes-qt/qt6/conan.inc b/recipes-qt/qt6/conan.inc
new file mode 100644
index 0000000..faad8ae
--- /dev/null
+++ b/recipes-qt/qt6/conan.inc
@@ -0,0 +1,52 @@
+# Generate Conan profile
+do_install:append:class-target() {
+    install -d ${D}${datadir}/conan
+    cat > ${D}${datadir}/conan/profile <<EOF
+[settings]
+os=Linux
+arch=${@map_conan_arch(d.getVar('TARGET_ARCH'), d)}
+compiler=gcc
+compiler.version=$(${CC} -dumpfullversion | cut -d . -f 1,2)
+compiler.libcxx=libstdc++11
+build_type=${BUILD_TYPE}
+[options]
+qtbase:cmake_args_qtbase="${@cmake_args_qtbase(d)}"
+*:cmake_args_leaf_module=""
+[build_requires]
+[env]
+CONAN_CMAKE_GENERATOR=${OECMAKE_GENERATOR}
+EOF
+}
+
+def map_conan_arch(a, d):
+    import re
+
+    valid_archs = "x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, \
+                  armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, \
+                  sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, \
+                  e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106"
+
+    if   re.match('i.86$', a):                  return 'x86'
+    elif re.match('x86.64$', a):                return 'x86_64'
+    elif re.match('arm$', a):                   return 'arm'
+    elif re.match('aarch64$', a):               return 'armv8'
+    elif re.match('mips(isa32)?(el)?$', a):     return 'mips'
+    elif re.match('mips(isa)?(64)?(el)?$', a):  return 'mips64'
+    elif re.match('p(pc|owerpc)$', a):          return 'ppc32be'
+    elif re.match('p(pc|owerpc)le$', a):        return 'ppc32'
+    elif re.match('p(pc|owerpc)64$', a):        return 'ppc64'
+    elif re.match('p(pc|owerpc)64le$', a):      return 'ppc64le'
+    elif re.match('sh4$', a):                   return 'sh4le'
+    elif a in valid_archs:                      return a
+    else:
+        bb.warn("cannot map '%s' to a conan architecture" % a)
+
+def cmake_args_qtbase(d):
+    import re
+    rm_args = ['-DQT_HOST_PATH[^ ]*']
+    args = d.getVar('EXTRA_OECMAKE')
+    for arg in rm_args:
+        args = re.sub(arg, '', args)
+    return args
+
+FILES:${PN}-dev += "${datadir}/conan"
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 20db420..e5c4edf 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -12,6 +12,7 @@ inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/conan.inc
 
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \