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-gnome/gdk-pixbuf | |
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-gnome/gdk-pixbuf')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb index 50e54d8eab..19848b5616 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | |||
@@ -31,7 +31,7 @@ LIBV = "2.10.0" | |||
31 | GDK_PIXBUF_LOADERS ?= "png jpeg" | 31 | GDK_PIXBUF_LOADERS ?= "png jpeg" |
32 | 32 | ||
33 | PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" | 33 | PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" |
34 | PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}" | 34 | PACKAGECONFIG_linuxstdbase = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}" |
35 | PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" | 35 | PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" |
36 | 36 | ||
37 | PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng" | 37 | PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng" |
@@ -45,7 +45,7 @@ PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" | |||
45 | 45 | ||
46 | EXTRA_OECONF = "\ | 46 | EXTRA_OECONF = "\ |
47 | --disable-introspection \ | 47 | --disable-introspection \ |
48 | ${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)} \ | 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)} \ |
49 | " | 49 | " |
50 | 50 | ||
51 | PACKAGES =+ "${PN}-xlib" | 51 | PACKAGES =+ "${PN}-xlib" |