diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 12:32:18 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-26 19:12:10 +0000 |
| commit | 2109ff6e37891cc37e39eae17bebfb80c53ad514 (patch) | |
| tree | 74c1396fdd4e6213bc84878242687a7222b835b1 | |
| parent | 5c5b7e8721b068f3557e251ecc40e61c34ca6ed1 (diff) | |
qt: use single -dev and -staticdev package
* don't create separate examples-dev and examples-staticdev for all modules
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 29 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 2 |
2 files changed, 13 insertions, 18 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 4b9476c6..b2ef46b0 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -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}:" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index a137b2f9..f15da918 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -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" |