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) | |
download | meta-qt5-4fb1e6084c7fec8e5e5667bca6e4a4ddfd8b500e.tar.gz |
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 @@ | |||
1 | # Copyright (C) 2012, 2014 O.S. Systems Software LTDA. | 1 | # Copyright (C) 2012, 2014 O.S. Systems Software LTDA. |
2 | # Copyright (C) 2013 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | inherit qmake5 | 4 | inherit qmake5 |
5 | 5 | ||
@@ -48,7 +48,7 @@ python __anonymous() { | |||
48 | # Many examples come with libraries installed outside of standard libdir, | 48 | # Many examples come with libraries installed outside of standard libdir, |
49 | # suppress QA check complaining | 49 | # suppress QA check complaining |
50 | INSANE_SKIP_${PN}-dbg += "libdir" | 50 | INSANE_SKIP_${PN}-dbg += "libdir" |
51 | INSANE_SKIP_${PN}-examples += "libdir" | 51 | INSANE_SKIP_${PN}-examples += "libdir staticdev dev-so" |
52 | 52 | ||
53 | PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples " | 53 | PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples " |
54 | 54 | ||
@@ -138,14 +138,6 @@ FILES_${PN}-dev += " \ | |||
138 | ${OE_QMAKE_PATH_LIBS}/*.prl \ | 138 | ${OE_QMAKE_PATH_LIBS}/*.prl \ |
139 | ${OE_QMAKE_PATH_LIBS}/*.la \ | 139 | ${OE_QMAKE_PATH_LIBS}/*.la \ |
140 | ${OE_QMAKE_PATH_HEADERS}/* \ | 140 | ${OE_QMAKE_PATH_HEADERS}/* \ |
141 | ${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \ | ||
142 | ${OE_QMAKE_PATH_EXAMPLES}/*/*${SOLIBSDEV} \ | ||
143 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*${SOLIBSDEV} \ | ||
144 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \ | ||
145 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \ | ||
146 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \ | ||
147 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ | ||
148 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ | ||
149 | " | 141 | " |
150 | FILES_${PN}-staticdev += " \ | 142 | FILES_${PN}-staticdev += " \ |
151 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 143 | ${OE_QMAKE_PATH_LIBS}/*.a \ |
@@ -161,17 +153,9 @@ FILES_${PN}-staticdev += " \ | |||
161 | ${OE_QMAKE_PATH_QML}/*/*/*/*.prl \ | 153 | ${OE_QMAKE_PATH_QML}/*/*/*/*.prl \ |
162 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ | 154 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ |
163 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ | 155 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ |
164 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ | ||
165 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ | ||
166 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \ | ||
167 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*.a \ | ||
168 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ | ||
169 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ | ||
170 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \ | ||
171 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \ | ||
172 | " | 156 | " |
173 | FILES_${PN}-examples = " \ | 157 | FILES_${PN}-examples = " \ |
174 | ${OE_QMAKE_PATH_EXAMPLES}/* \ | 158 | ${OE_QMAKE_PATH_EXAMPLES} \ |
175 | " | 159 | " |
176 | 160 | ||
177 | PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" | 161 | PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" |