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) | |
download | meta-qt5-2109ff6e37891cc37e39eae17bebfb80c53ad514.tar.gz |
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() { | |||
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" |
52 | INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf" | ||
53 | 52 | ||
54 | PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples " | 53 | PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples " |
55 | 54 | ||
56 | ALLOW_EMPTY_${PN} = "1" | 55 | ALLOW_EMPTY_${PN} = "1" |
57 | ALLOW_EMPTY_${PN}-plugins = "1" | 56 | ALLOW_EMPTY_${PN}-plugins = "1" |
@@ -139,6 +138,14 @@ FILES_${PN}-dev += " \ | |||
139 | ${OE_QMAKE_PATH_LIBS}/*.prl \ | 138 | ${OE_QMAKE_PATH_LIBS}/*.prl \ |
140 | ${OE_QMAKE_PATH_LIBS}/*.la \ | 139 | ${OE_QMAKE_PATH_LIBS}/*.la \ |
141 | ${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} \ | ||
142 | " | 149 | " |
143 | FILES_${PN}-staticdev += " \ | 150 | FILES_${PN}-staticdev += " \ |
144 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 151 | ${OE_QMAKE_PATH_LIBS}/*.a \ |
@@ -154,21 +161,6 @@ FILES_${PN}-staticdev += " \ | |||
154 | ${OE_QMAKE_PATH_QML}/*/*/*/*.prl \ | 161 | ${OE_QMAKE_PATH_QML}/*/*/*/*.prl \ |
155 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ | 162 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.a \ |
156 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ | 163 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.prl \ |
157 | " | ||
158 | FILES_${PN}-examples = " \ | ||
159 | ${OE_QMAKE_PATH_EXAMPLES}/* \ | ||
160 | " | ||
161 | FILES_${PN}-examples-dev = " \ | ||
162 | ${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \ | ||
163 | ${OE_QMAKE_PATH_EXAMPLES}/*/*${SOLIBSDEV} \ | ||
164 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*${SOLIBSDEV} \ | ||
165 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*${SOLIBSDEV} \ | ||
166 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*${SOLIBSDEV} \ | ||
167 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*${SOLIBSDEV} \ | ||
168 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ | ||
169 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ | ||
170 | " | ||
171 | FILES_${PN}-examples-staticdev = " \ | ||
172 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ | 164 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ |
173 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ | 165 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ |
174 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \ | 166 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*.a \ |
@@ -178,5 +170,8 @@ FILES_${PN}-examples-staticdev = " \ | |||
178 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \ | 170 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \ |
179 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \ | 171 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \ |
180 | " | 172 | " |
173 | FILES_${PN}-examples = " \ | ||
174 | ${OE_QMAKE_PATH_EXAMPLES}/* \ | ||
175 | " | ||
181 | 176 | ||
182 | PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" | 177 | 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, | |||
65 | PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" | 65 | PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" |
66 | 66 | ||
67 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe | 67 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe |
68 | PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" | 68 | PACKAGES_remove = "${PN}-examples" |
69 | 69 | ||
70 | QT_MODULE_BRANCH = "dev" | 70 | QT_MODULE_BRANCH = "dev" |
71 | 71 | ||