Patchwork [13/15] qmake5.inc: Make RDEPEND on shared objects and split into more packages

login
register
mail settings
Submitter Svend Aage Vedstesen
Date July 9, 2014, 8:41 a.m.
Message ID <016660e847e6937bdd77bc835714c464d95ba639.1404891982.git.Svend.Vedstesen@prevas.dk>
Download mbox | patch
Permalink /patch/368144/
State New
Headers show

Comments

Svend Aage Vedstesen - July 9, 2014, 8:41 a.m.
Make a runtime dependency to the shared objects which are needed in the
SDK package. In order to avoid adding too many files the content of the
${libdir} is split into 4 packages (libs, cmake, plugins, mkspecs).
Only libs is added to RDEPENDS.
---
 recipes/qt5/qmake5.inc | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

Patch

diff --git a/recipes/qt5/qmake5.inc b/recipes/qt5/qmake5.inc
index f3569ff..b39d0f3 100644
--- a/recipes/qt5/qmake5.inc
+++ b/recipes/qt5/qmake5.inc
@@ -143,9 +143,28 @@  do_install_mingw_fixup () {
 
 FILES_${PN} += " ${libdir}"
 
+PACKAGES =+ "${PN}-libs"
+DEPENDS_${PN} += "${PN}-libs"
+RDEPENDS_${PN} += "${PN}-libs"
+# Make libs hold shared objects only - to be used in the SDK
+FILES_${PN}-libs = "${libdir}/*.so*"
+
+PACKAGES =+ "${PN}-cmake"
+FILES_${PN}-cmake = "${libdir}/cmake"
+
+PACKAGES =+ "${PN}-plugins"
+DEPENDS_${PN} += "${PN}-plugins"
+RDEPENDS_${PN} += "${PN}-plugins"
+FILES_${PN}-plugins = "${libdir}/qt5/plugins"
+
+PACKAGES =+ "${PN}-mkspecs"
+DEPENDS_${PN} += "${PN}-mkspecs"
+RDEPENDS_${PN} += "${PN}-mkspecs"
+FILES_${PN}-mkspecs = "${libdir}/qt5/mkspecs"
+
 PACKAGES =+ " ${PN}-utilities "
 FILES_${PN}-utilities = "${bindir}"
 DEPENDS_${PN} += "${PN}-utilities"
 EXTRA_RDEPENDS_UTILITIES = "librt"
 EXTRA_RDEPENDS_UTILITIES:HOST_LIBC_mingw = ""
-RDEPENDS_${PN}-utilities = "${EXTRA_RDEPENDS_UTILITIES} libgcc libpthread libz libstdc++ libm"
+RDEPENDS_${PN}-utilities = "${EXTRA_RDEPENDS_UTILITIES} ${PN}-libs libgcc libpthread libz libstdc++ libm"