diff options
-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 6b76cba959..a8ecda8d4f 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -5,7 +5,8 @@ SECTION = "base" | |||
5 | LICENSE = "AFL-2 | GPLv2+" | 5 | LICENSE = "AFL-2 | GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ |
7 | file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" | 7 | file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" |
8 | DEPENDS = "expat virtual/libintl virtual/libx11 libsm" | 8 | X11DEPENDS = "virtual/libx11 libsm" |
9 | DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" | ||
9 | DEPENDS_virtclass-native = "expat-native virtual/libintl-native" | 10 | DEPENDS_virtclass-native = "expat-native virtual/libintl-native" |
10 | DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" | 11 | DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" |
11 | 12 | ||
@@ -22,7 +23,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session | |||
22 | 23 | ||
23 | DEBIANNAME_${PN} = "dbus-1" | 24 | DEBIANNAME_${PN} = "dbus-1" |
24 | 25 | ||
25 | PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd" | 26 | PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}" |
26 | 27 | ||
27 | FILES_${PN}-x11 = "${bindir}/dbus-launch" | 28 | FILES_${PN}-x11 = "${bindir}/dbus-launch" |
28 | RDEPENDS_${PN}-x11 = "${PN}" | 29 | RDEPENDS_${PN}-x11 = "${PN}" |
@@ -73,7 +74,7 @@ pkg_postinst_dbus() { | |||
73 | fi | 74 | fi |
74 | } | 75 | } |
75 | 76 | ||
76 | EXTRA_OECONF_X = "--with-x" | 77 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" |
77 | EXTRA_OECONF_X_virtclass-native = "--without-x" | 78 | EXTRA_OECONF_X_virtclass-native = "--without-x" |
78 | 79 | ||
79 | EXTRA_OECONF = "--disable-tests \ | 80 | EXTRA_OECONF = "--disable-tests \ |