diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 05bc716d..eaca3666 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -50,7 +50,7 @@ PACKAGECONFIG_DISTRO ?= "" | |||
50 | PACKAGECONFIG_RELEASE ?= "release" | 50 | PACKAGECONFIG_RELEASE ?= "release" |
51 | # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency | 51 | # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency |
52 | # PACKAGECONFIG_OPENSSL ?= "openssl" | 52 | # PACKAGECONFIG_OPENSSL ?= "openssl" |
53 | PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freetype tests \ | 53 | PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freetype tests pcre \ |
54 | ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ | 54 | ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ |
55 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ | 55 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ |
56 | " | 56 | " |
@@ -277,22 +277,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
277 | 277 | ||
278 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 278 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
279 | 279 | ||
280 | TARGET_MKSPEC ?= "linux-g++" | ||
281 | |||
282 | # use clean mkspecs on target | ||
283 | pkg_postinst_${PN}-tools () { | ||
284 | sed -i \ | ||
285 | -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ | ||
286 | -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ | ||
287 | $D${OE_QMAKE_PATH_BINS}/qt.conf | ||
288 | } | ||
289 | |||
290 | pkg_postinst_${PN}-mkspecs () { | ||
291 | sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri | ||
292 | sed -i \ | ||
293 | -e 's: cross_compile : :g' \ | ||
294 | -e 's:HOST_QT_TOOLS =.*::g' \ | ||
295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | ||
296 | } | ||
297 | |||
298 | SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" | 280 | SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" |