diff options
| author | Phil Blundell <philb@gnu.org> | 2011-08-12 16:59:43 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-15 15:26:20 +0100 |
| commit | 98d201f8609bd66674e7feb9866d64db74a4f67a (patch) | |
| tree | 49cf3ffc21c38eece0f909707c346aab4ee6981c | |
| parent | 3c1701b7c91a7f9366f43eaccce9fdeeedac6c31 (diff) | |
| download | ast2050-yocto-poky-98d201f8609bd66674e7feb9866d64db74a4f67a.zip ast2050-yocto-poky-98d201f8609bd66674e7feb9866d64db74a4f67a.tar.gz | |
dbus: only use x11 if DISTRO_FEATURES has selected it
This makes it possible to include dbus in a non-X11-equipped DISTRO.
(From OE-Core rev: abf2ab7b4d6e9f615f86ba84e684ae0753c602a8)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 6b76cba..a8ecda8 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -5,7 +5,8 @@ SECTION = "base" LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" -DEPENDS = "expat virtual/libintl virtual/libx11 libsm" +X11DEPENDS = "virtual/libx11 libsm" +DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" DEPENDS_virtclass-native = "expat-native virtual/libintl-native" DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" @@ -22,7 +23,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = "dbus-1" -PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd" +PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}" FILES_${PN}-x11 = "${bindir}/dbus-launch" RDEPENDS_${PN}-x11 = "${PN}" @@ -73,7 +74,7 @@ pkg_postinst_dbus() { fi } -EXTRA_OECONF_X = "--with-x" +EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" EXTRA_OECONF_X_virtclass-native = "--without-x" EXTRA_OECONF = "--disable-tests \ |
