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

qt: use single -dev and -staticdev package

Browse Source 
* don't create separate examples-dev and examples-staticdev for all modules

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2018-09-14 12:32:18 +00:00
parent 5c5b7e8721
commit 2109ff6e37
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
recipes-qt/qt5/qt5.inc
View File

@@ -49,9 +49,8 @@ python __anonymous() {
# suppress QA check complaining
INSANE_SKIP_${PN}-dbg += "libdir"
INSANE_SKIP_${PN}-examples += "libdir"
INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf"
PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples "
PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples "
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-plugins = "1"
@@ -139,6 +138,14 @@ FILES_${PN}-dev += " \
${OE_QMAKE_PATH_LIBS}/*.prl \
${OE_QMAKE_PATH_LIBS}/*.la \
${OE_QMAKE_PATH_HEADERS}/* \
${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \
"
FILES_${PN}-staticdev += " \
${OE_QMAKE_PATH_LIBS}/*.a \
@@ -154,21 +161,6 @@ FILES_${PN}-staticdev += " \
${OE_QMAKE_PATH_QML}/*/*/*/*.prl \
${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \
${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \
"
FILES_${PN}-examples = " \
${OE_QMAKE_PATH_EXAMPLES}/* \
"
FILES_${PN}-examples-dev = " \
${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \
"
FILES_${PN}-examples-staticdev = " \
${OE_QMAKE_PATH_EXAMPLES}/*.a \
${OE_QMAKE_PATH_EXAMPLES}/*/*.a \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \
@@ -178,5 +170,8 @@ FILES_${PN}-examples-staticdev = " \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \
${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \
"
FILES_${PN}-examples = " \
${OE_QMAKE_PATH_EXAMPLES}/* \
"
PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"

2
recipes-qt/qt5/qtwebkit_git.bb
View File

@@ -65,7 +65,7 @@ PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF,
PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen"
# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe
PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples"
PACKAGES_remove = "${PN}-examples"
QT_MODULE_BRANCH = "dev"