From b6bd407eea6cd6733e920e3aa9b024b6fdc5e066 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 19 Dec 2019 13:49:05 -0800
Subject: qmllive: Fix build with multilib settings

Fixes
ERROR: qmllive-5.12+gitAUTOINC+0c7bf141b0-r0 do_package: QA Issue: qmllive: Files/directories were installed but not shipped in any p
ackage:
  /usr/lib/libqmllive.so.1.0
  /usr/lib/libqmllive.so
  /usr/lib/libqmllive.so.1.0.0
  /usr/lib/libqmllive.so.1
  /usr/lib/pkgconfig
  /usr/lib/pkgconfig/qmllive.pc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-lib.pro-Append-LIB_ARCH-to-lib.patch      | 39 ++++++++++++++++++++++
 recipes-qt/qmllive/qmllive_git.bb                  |  5 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch

(limited to 'recipes-qt')

diff --git a/recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch b/recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch
new file mode 100644
index 00000000..9a54b902
--- /dev/null
+++ b/recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch
@@ -0,0 +1,39 @@
+From 647b1da38d8c741681de9c89f2090f0edcf25a47 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 19 Dec 2019 13:40:34 -0800
+Subject: [PATCH] lib.pro: Append LIB_ARCH to lib
+
+appending to lib so it becomes lib64 when needed and LIB_ARCH can be set
+in evnironment
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/lib.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib.pro b/src/lib.pro
+index b5f8ab6..0731d01 100755
+--- a/src/lib.pro
++++ b/src/lib.pro
+@@ -18,7 +18,7 @@ public_headers += \
+ include(src.pri)
+ 
+ win32: target.path = $${PREFIX}/bin
+-else: target.path = $${PREFIX}/lib
++else: target.path = $${PREFIX}/lib$${LIB_ARCH}
+ INSTALLS += target
+ 
+ headers.files = $$public_headers
+@@ -30,7 +30,7 @@ INSTALLS += headers
+     QMAKE_PKGCONFIG_NAME = qmllive
+     QMAKE_PKGCONFIG_DESCRIPTION = Qt QmlLive Library
+     QMAKE_PKGCONFIG_PREFIX = $$PREFIX
+-    QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib
++    QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib$${LIB_ARCH}
+     QMAKE_PKGCONFIG_INCDIR = ${prefix}/include/qmllive
+     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ }
+-- 
+2.24.1
+
diff --git a/recipes-qt/qmllive/qmllive_git.bb b/recipes-qt/qmllive/qmllive_git.bb
index bc9a3784..8a4a6ce7 100644
--- a/recipes-qt/qmllive/qmllive_git.bb
+++ b/recipes-qt/qmllive/qmllive_git.bb
@@ -7,12 +7,15 @@ DEPENDS = "qtbase qtdeclarative"
 PV = "5.12+git${SRCPV}"
 
 QT_GIT_PROJECT = "qt-apps"
-SRC_URI = "${QT_GIT}/qmllive.git;branch=dev"
+SRC_URI = "${QT_GIT}/qmllive.git;branch=dev \
+           file://0001-lib.pro-Append-LIB_ARCH-to-lib.patch \
+          "
 SRCREV = "0c7bf141b08aa9e757e91a4a05769257d043eab2"
 S = "${WORKDIR}/git"
 
 inherit pkgconfig qmake5
 
+EXTRA_QMAKEVARS_PRE += "LIB_ARCH=${@d.getVar('baselib').replace('lib', '')}"
 EXTRA_QMAKEVARS_POST = "QMAKE_RPATHDIR="
 
 FILES_${PN}-dev += "${datadir}"
-- 
cgit v1.2.3