diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-graphics/cairo | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index b15fbc94b9..c0af1e3632 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc | |||
@@ -13,8 +13,8 @@ LICENSE = "MPL-1 & LGPLv2.1" | |||
13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" | 13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" |
14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" | 14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" |
15 | 15 | ||
16 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
17 | ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
18 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" | 18 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" |
19 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" | 19 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" |
20 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" | 20 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" |