mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-10-05 09:15:38 +02:00
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>
This commit is contained in:
@@ -10,6 +10,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
|
||||
RDEPENDS_${PN} += " \
|
||||
nativesdk-packagegroup-sdk-host \
|
||||
nativesdk-qttools-tools \
|
||||
nativesdk-qtbase-tools \
|
||||
nativesdk-qtbase \
|
||||
nativesdk-perl-modules \
|
||||
"
|
||||
|
||||
@@ -55,34 +55,22 @@ SRC_URI += " \
|
||||
file://OEQt5Toolchain.cmake \
|
||||
"
|
||||
|
||||
PACKAGES = "${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools"
|
||||
|
||||
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
|
||||
|
||||
FILES_${PN}-tools-dev = " \
|
||||
${includedir} \
|
||||
${FILES_SOLIBSDEV} ${libdir}/*.la \
|
||||
${libdir}/*.prl \
|
||||
FILES_${PN}-dev += " \
|
||||
${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
|
||||
${OE_QMAKE_PATH_LIBS}/*.prl \
|
||||
"
|
||||
|
||||
FILES_${PN}-tools-staticdev = " \
|
||||
${OE_QMAKE_PATH_LIBS}/*.a \
|
||||
"
|
||||
|
||||
FILES_${PN}-tools = " \
|
||||
${libdir}/lib*${SOLIBS} \
|
||||
${OE_QMAKE_PATH_BINS}/* \
|
||||
FILES_${PN} += " \
|
||||
${SDKPATHNATIVE}/environment-setup.d \
|
||||
${datadir}/cmake \
|
||||
"
|
||||
|
||||
# qttools binaries are placed in a subdir of bin in order to avoid
|
||||
# collisions with qt4. This would trigger debian.bbclass to rename the
|
||||
# package, since it doesn't detect binaries in subdirs. Explicitly
|
||||
# disable package auto-renaming for the tools-package.
|
||||
DEBIAN_NOAUTONAME_${PN}-tools = "1"
|
||||
DEBIAN_NOAUTONAME_${PN} = "1"
|
||||
|
||||
QT_CONFIG_FLAGS += " \
|
||||
-shared \
|
||||
|
||||
Reference in New Issue
Block a user