t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-11 08:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

qmllive: Fix build with multilib settings

Browse Source 
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>
This commit is contained in:
Khem Raj
2019-12-19 13:49:05 -08:00
parent 69e1fd33c1
commit b6bd407eea
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
recipes-qt/qmllive/qmllive/0001-lib.pro-Append-LIB_ARCH-to-lib.patch Normal file
View File

@@ -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

5
recipes-qt/qmllive/qmllive_git.bb
View File

@@ -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}"