diff options
author | Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> | 2013-11-07 18:21:17 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-18 23:14:09 +0100 |
commit | a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a (patch) | |
tree | 0afa42c1676d7161f790085e912a7154abd3e9ff | |
parent | 4580f49afe7d974f279eae766c0171aeb208689a (diff) | |
download | meta-openembedded-a64bd5b7e4e95d71c8dd5439ac30f2e3fbcff77a.tar.gz |
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@polytechnique.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-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/ |