summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-04-30 13:57:09 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-02 15:16:07 +0200
commit802b395222054f39501f1e02879d5c708b3da8d9 (patch)
treeba4c6ba17e934b4eda23f481dda0a3751c4da7e9 /recipes-qt/qt5/qtbase_git.bb
parent754aaadc7f0a1c98a4895899617afbaef0f1cdfa (diff)
downloadmeta-qt5-802b395222054f39501f1e02879d5c708b3da8d9.tar.gz
replace base_contains by bb.utils.contains
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 09f8ebde..b85c5632 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -34,12 +34,12 @@ RDEPENDS_${PN}-tools += "perl"
34# PACKAGECONFIG is kept rather minimal for people who don't need 34# PACKAGECONFIG is kept rather minimal for people who don't need
35# stuff like webkit (and it's easier to add options than remove) 35# stuff like webkit (and it's easier to add options than remove)
36 36
37PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 37PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
38PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 38PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
39PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor glib gtkstyle xkb', '', d)}" 39PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor glib gtkstyle xkb', '', d)}"
40PACKAGECONFIG_FONTS ?= "" 40PACKAGECONFIG_FONTS ?= ""
41PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 41PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
42PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 42PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
43PACKAGECONFIG_DISTRO ?= "" 43PACKAGECONFIG_DISTRO ?= ""
44# Either release or debug, can be overridden in bbappends 44# Either release or debug, can be overridden in bbappends
45PACKAGECONFIG_RELEASE ?= "release" 45PACKAGECONFIG_RELEASE ?= "release"
@@ -254,7 +254,7 @@ FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_QT_FONTS}/*.qpf*"
254FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \ 254FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \
255 ${OE_QMAKE_PATH_QT_FONTS}/fontdir" 255 ${OE_QMAKE_PATH_QT_FONTS}/fontdir"
256 256
257RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 257RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
258 258
259sysroot_stage_dirs_append() { 259sysroot_stage_dirs_append() {
260 # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all 260 # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all