From d83b16dbf0862be387f84228710cb165c6d2b03b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:20 -0300 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/glib-2.0/glib.inc') diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index cb07665d23..4d2726287c 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -16,7 +16,7 @@ SECTION = "libs" BBCLASSEXTEND = "native nativesdk" DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" -DEPENDS_append_class-target = "${@base_contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native" @@ -31,7 +31,7 @@ S = "${WORKDIR}/glib-${PV}" CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" -PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" +PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" -- cgit 1.2.3-korg