diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 14:46:22 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-26 19:12:10 +0000 |
| commit | 4fb1e6084c7fec8e5e5667bca6e4a4ddfd8b500e (patch) | |
| tree | 90cde46a3e6cfb5326022551c00113fef015aab9 | |
| parent | 2109ff6e37891cc37e39eae17bebfb80c53ad514 (diff) | |
qt: package all files in ${PN}-examples
* including static and dev files
* and disable QA warning about that:
ERROR: qtbase-5.11.2+gitAUTOINC+49efea26a5-r0 do_package_qa: QA Issue: non -staticdev package contains static .a library: qtbase-examples path '/work/core2-64-oe-linux/qtbase/5.11.2+gitAUTOINC+49efea26a5-r0/packages-split/qtbase-examples/usr/share/examples/widgets/tools/plugandpaint/plugins/libpnp_basictools.a' [staticdev]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index b2ef46b0..e0cd8949 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -1,5 +1,5 @@ # Copyright (C) 2012, 2014 O.S. Systems Software LTDA. -# Copyright (C) 2013 Martin Jansa <martin.jansa@gmail.com> +# Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> inherit qmake5 @@ -48,7 +48,7 @@ python __anonymous() { # Many examples come with libraries installed outside of standard libdir, # suppress QA check complaining INSANE_SKIP_${PN}-dbg += "libdir" -INSANE_SKIP_${PN}-examples += "libdir" +INSANE_SKIP_${PN}-examples += "libdir staticdev dev-so" PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples " @@ -138,14 +138,6 @@ 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 \ @@ -161,17 +153,9 @@ FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_QML}/*/*/*/*.prl \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ - ${OE_QMAKE_PATH_EXAMPLES}/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \ " FILES_${PN}-examples = " \ - ${OE_QMAKE_PATH_EXAMPLES}/* \ + ${OE_QMAKE_PATH_EXAMPLES} \ " PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" |