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-core/glib-2.0 | |
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-core/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
16 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
17 | 17 | ||
18 | DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" | 18 | DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" |
19 | DEPENDS_append_class-target = "${@base_contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" | 19 | DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" |
20 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" | 20 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" |
21 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native" | 21 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native" |
22 | 22 | ||
@@ -31,7 +31,7 @@ S = "${WORKDIR}/glib-${PV}" | |||
31 | 31 | ||
32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" | 32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" |
33 | 33 | ||
34 | PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" | 34 | PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" |
35 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" | 35 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" |
36 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | 36 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
37 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" | 37 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" |