summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-23 17:32:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-02 13:01:01 +0000
commitd43adee2236b048a665095232a0d2c511ff3949e (patch)
treeb4172917007203411a1ae4a8c02558b371d3e36c
parentace19818e1db34157ed1585056510618616f6a47 (diff)
downloadpoky-d43adee2236b048a665095232a0d2c511ff3949e.tar.gz
dbus: use PACKAGECONFIG for X11 and systemd
Instead of several variables and overrides, use PACKAGECONFIG to respect X11 and systemd DISTRO_FEATURES. (From OE-Core rev: 963da99c77ad28bd184a4de59af9cbcfaef62358) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus.inc25
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 343079ccdf..625e975934 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -5,10 +5,7 @@ SECTION = "base"
5LICENSE = "AFL-2 | GPLv2+" 5LICENSE = "AFL-2 | GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
8X11DEPENDS = "virtual/libx11 libsm" 8DEPENDS = "expat virtual/libintl"
9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
10DEPENDS_class-native = "expat-native virtual/libintl-native"
11DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
12RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" 9RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}"
13RDEPENDS_dbus_class-native = "" 10RDEPENDS_dbus_class-native = ""
14RDEPENDS_dbus_class-nativesdk = "" 11RDEPENDS_dbus_class-nativesdk = ""
@@ -70,21 +67,23 @@ pkg_postinst_dbus() {
70 fi 67 fi
71} 68}
72 69
73EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
74EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch"
75# TODO: would like to --enable-systemd but that's a circular build-dependency
76# between systemd<->dbus
77EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
78
79EXTRA_OECONF = "--disable-tests \ 70EXTRA_OECONF = "--disable-tests \
80 --disable-checks \ 71 --disable-checks \
81 --disable-xml-docs \ 72 --disable-xml-docs \
82 --disable-doxygen-docs \ 73 --disable-doxygen-docs \
83 --disable-libaudit \ 74 --disable-libaudit \
84 --with-xml=expat \ 75 --with-xml=expat \
85 --disable-systemd \ 76 --disable-systemd"
86 ${EXTRA_OECONF_SYSTEMD} \ 77
87 ${EXTRA_OECONF_X}" 78PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
79 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
80PACKAGECONFIG_class-native = ""
81PACKAGECONFIG_class-nativesdk = ""
82
83# Would like to --enable-systemd but that's a circular build-dependency between
84# systemd<->dbus
85PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
86PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
88 87
89do_install() { 88do_install() {
90 autotools_do_install 89 autotools_do_install