From a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a Mon Sep 17 00:00:00 2001 From: Alexandre Tuleu Date: Thu, 7 Nov 2013 18:21:17 +0000 Subject: 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 Signed-off-by: Martin Jansa --- 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 fa554ed738..d7d281f46e 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/ -- cgit v1.2.3-54-g00ecf