summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-09-14 12:28:36 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-09-20 13:16:22 +0000
commit3224b028e70ab3a910ce4fccdd9f3fac4e37011f (patch)
treeb6922796cd5bd2bf8f6075520b01b91a70f536b5 /recipes-qt/qt5
parent66c49f8a1d4ab5ab37a977c4234f58ea8ceb6053 (diff)
downloadmeta-qt5-3224b028e70ab3a910ce4fccdd9f3fac4e37011f.tar.gz
nativesdk-qtbase: use default PACKAGES
* don't append -tools to all packages * fixes automatic packaging of .debug files in ${PN}-dbg Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb18
1 files changed, 3 insertions, 15 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 5bea3c89..96d3e055 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -55,34 +55,22 @@ SRC_URI += " \
55 file://OEQt5Toolchain.cmake \ 55 file://OEQt5Toolchain.cmake \
56" 56"
57 57
58PACKAGES = "${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools"
59
60PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" 58PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
61 59
62FILES_${PN}-tools-dev = " \ 60FILES_${PN}-dev += " \
63 ${includedir} \
64 ${FILES_SOLIBSDEV} ${libdir}/*.la \
65 ${libdir}/*.prl \
66 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ 61 ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
67 ${OE_QMAKE_PATH_LIBS}/*.prl \ 62 ${OE_QMAKE_PATH_LIBS}/*.prl \
68" 63"
69 64
70FILES_${PN}-tools-staticdev = " \ 65FILES_${PN} += " \
71 ${OE_QMAKE_PATH_LIBS}/*.a \
72"
73
74FILES_${PN}-tools = " \
75 ${libdir}/lib*${SOLIBS} \
76 ${OE_QMAKE_PATH_BINS}/* \
77 ${SDKPATHNATIVE}/environment-setup.d \ 66 ${SDKPATHNATIVE}/environment-setup.d \
78 ${datadir}/cmake \
79" 67"
80 68
81# qttools binaries are placed in a subdir of bin in order to avoid 69# qttools binaries are placed in a subdir of bin in order to avoid
82# collisions with qt4. This would trigger debian.bbclass to rename the 70# collisions with qt4. This would trigger debian.bbclass to rename the
83# package, since it doesn't detect binaries in subdirs. Explicitly 71# package, since it doesn't detect binaries in subdirs. Explicitly
84# disable package auto-renaming for the tools-package. 72# disable package auto-renaming for the tools-package.
85DEBIAN_NOAUTONAME_${PN}-tools = "1" 73DEBIAN_NOAUTONAME_${PN} = "1"
86 74
87QT_CONFIG_FLAGS += " \ 75QT_CONFIG_FLAGS += " \
88 -shared \ 76 -shared \