summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/emacs/emacs.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/emacs/emacs.inc')
-rw-r--r--meta-oe/recipes-support/emacs/emacs.inc5
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 = " \
19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " 19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
20 20
21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
22PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x,${X11DEPENDS}" 22PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}"
23
23 24
24inherit autotools 25inherit 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/