diff options
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/emacs/emacs.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index fa554ed73..d7d281f46 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc | |||
@@ -19,7 +19,8 @@ X11DEPENDS = " \ | |||
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 ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x,${X11DEPENDS}" | 22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" |
23 | |||
23 | 24 | ||
24 | inherit autotools | 25 | inherit autotools |
25 | 26 | ||
@@ -87,7 +88,7 @@ do_compile_prepend() { | |||
87 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ | 88 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ |
88 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ | 89 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ |
89 | 90 | ||
90 | if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then | 91 | if [ ! -z "${@base_contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then |
91 | echo "X11 build enabled" | 92 | echo "X11 build enabled" |
92 | # copy only as much stuff as we need | 93 | # copy only as much stuff as we need |
93 | # before: 5.5G ../../qemu-treedir/ | 94 | # before: 5.5G ../../qemu-treedir/ |