diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-03-01 18:30:49 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-07 13:30:26 +0100 |
| commit | 0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch) | |
| tree | 362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-oe/recipes-support/emacs/emacs.inc | |
| parent | b4524eb786472e69e28212a58a329a5e44e40547 (diff) | |
| download | meta-openembedded-0c31f55bcfd6630d894dd2dda6ca483bea5de4ab.tar.gz | |
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.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 012895e85f..5b905f93f9 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 ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', '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 "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then | 89 | if [ ! -z "${@bb.utils.filter('PACKAGECONFIG', '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/ |
