diff mbox

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

Message ID CFDF955F78BEAB47A018765A600E2BDC938F05B8@VMPREVAS1.prevas.se
State Accepted
Delegated to: Christian Sørensen
Headers show

Commit Message

christian.braunersorensen@prevas.dk July 25, 2014, 10:27 a.m. UTC
Hi Svend Aaage

Thanks for the patch!

Merged to master.

/Christian
diff mbox

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"