diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:49 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:38 +0200 |
commit | 21f10c11f39020f9502d741c774a12d1aeb39499 (patch) | |
tree | fdc66c039950da89d82b6b7405ebfc50cbba693a /meta-oe/recipes-support/emacs/emacs.inc | |
parent | 723b55f5c1f7df21dbcfa7cb2dcaecb10d886041 (diff) | |
download | meta-openembedded-21f10c11f39020f9502d741c774a12d1aeb39499.tar.gz |
meta-oe: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/emacs/emacs.inc')
-rw-r--r-- | meta-oe/recipes-support/emacs/emacs.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index e706b18c9..ffb5c50c7 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc | |||
@@ -18,7 +18,7 @@ X11DEPENDS = " \ | |||
18 | 18 | ||
19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " | 19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " |
20 | 20 | ||
21 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" | 22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" |
23 | 23 | ||
24 | 24 | ||
@@ -86,7 +86,7 @@ do_compile_prepend() { | |||
86 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ | 86 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ |
87 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ | 87 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ |
88 | 88 | ||
89 | if [ ! -z "${@base_contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then | 89 | if [ ! -z "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then |
90 | echo "X11 build enabled" | 90 | echo "X11 build enabled" |
91 | # copy only as much stuff as we need | 91 | # copy only as much stuff as we need |
92 | # before: 5.5G ../../qemu-treedir/ | 92 | # before: 5.5G ../../qemu-treedir/ |