summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-04-21 19:30:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:58:43 +0100
commita13343b09488888a1b35738bd9cb0c7b8869a9d6 (patch)
tree2b2c299408f50f1183d311b75679fe73ddc781b0
parentcb613904fdce3d084ee76d1f240152fe91e27aa5 (diff)
downloadopenembedded-core-contrib-a13343b09488888a1b35738bd9cb0c7b8869a9d6.tar.gz
openembedded-core-contrib-a13343b09488888a1b35738bd9cb0c7b8869a9d6.tar.bz2
openembedded-core-contrib-a13343b09488888a1b35738bd9cb0c7b8869a9d6.zip
directfb/pango/webkit: base_contains -> bb.utils.contains
(From OE-Core rev: 7e971e079cb52e9de8d95b6e4126698a1402988f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/directfb/directfb.inc2
-rw-r--r--meta/recipes-graphics/pango/pango_1.38.1.bb2
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.10.7.bb4
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index f6b7cbe1ad..46748988ea 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -26,7 +26,7 @@ S = "${WORKDIR}/DirectFB-${PV}"
LDFLAGS_append =" -lts -lm"
# Workaround for linking issues seen with armv7a + gold
-LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
BINCONFIG = "${bindir}/directfb-config"
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb
index 7fc65fd439..756dac4d13 100644
--- a/meta/recipes-graphics/pango/pango_1.38.1.bb
+++ b/meta/recipes-graphics/pango/pango_1.38.1.bb
@@ -36,7 +36,7 @@ LIBV = "1.8.0"
# This binary needs to be compiled for the host architecture. This isn't pretty!
do_compile_prepend_class-target () {
- if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode
fi
}
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
index 8eb6b9f3b2..d4f1d3b8aa 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
@@ -34,8 +34,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
ruby-native libnotify gstreamer1.0-plugins-bad \
"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
- ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \
enchant \
gtk2 \
libsecret \