emacs: Allows non-x11 build on distribution supporting x11

Submitted by Alexandre Tuleu on Nov. 7, 2013, 6:21 p.m.

Details

Message ID 1383848477-9236-1-git-send-email-alexandre.tuleu.2005@polytechnique.org
State Accepted, archived
Headers show

Commit Message

Alexandre Tuleu Nov. 7, 2013, 6:21 p.m.
By default emacs will build with x11 if the distribution has x11
support. However in a .bbappend file a user could strip away x11
support, even if x11 is supported on the platform. There was another
check in do_compile_prepend() that checked if the distro has x11
feature and not if PACAKAGECONFIG enables x11 support.

Since in this receipe dbus dependence is only marked if x11 is
enabled, desactiving x11 support should also desactivate dbus support.

Signed-off-by: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
---
 meta-oe/recipes-support/emacs/emacs.inc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index fa554ed..d7d281f 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -19,7 +19,8 @@  X11DEPENDS = " \
 EXTRA_OECONF =  "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x,${X11DEPENDS}"
+PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}"
+
 
 inherit autotools
 
@@ -87,7 +88,7 @@  do_compile_prepend() {
     ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
     ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
 
-    if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then
+    if [ ! -z "${@base_contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then
         echo "X11 build enabled"
         # copy only as much stuff as we need
         # before: 5.5G   ../../qemu-treedir/