[oe-commits] Alexandre Tuleu : emacs: Allows non-x11 build on distribution supporting x11

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a

Author: Alexandre Tuleu <alexandre.tuleu.2005 at polytechnique.org>
Date:   Thu Nov  7 18:21:17 2013 +0000

emacs: Allows non-x11 build on distribution supporting x11

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 at polytechnique.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/emacs/emacs.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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/