diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-12-23 17:32:55 +0000 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2014-01-26 14:08:26 +0800 |
| commit | 2e7c07c6b670a68e20e11a22716f2b69e49cac5e (patch) | |
| tree | 9cbf94f8e854203721903fae64b290bd0c8b5b60 | |
| parent | b3c051aecde0c0662b352eb789ed276ef00e626f (diff) | |
| download | openembedded-core-2e7c07c6b670a68e20e11a22716f2b69e49cac5e.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 master rev: 963da99c77ad28bd184a4de59af9cbcfaef62358)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 5864643996..e1b48a45bc 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -5,10 +5,7 @@ SECTION = "base" LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" -X11DEPENDS = "virtual/libx11 libsm" -DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" -DEPENDS_class-native = "expat-native virtual/libintl-native" -DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl" +DEPENDS = "expat virtual/libintl" RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" RDEPENDS_class-native = "" @@ -72,21 +69,23 @@ pkg_postinst_dbus() { fi } -EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" -# TODO: would like to --enable-systemd but that's a circular build-dependency -# between systemd<->dbus -EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - EXTRA_OECONF = "--disable-tests \ --disable-checks \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ --with-xml=expat \ - --disable-systemd \ - ${EXTRA_OECONF_SYSTEMD} \ - ${EXTRA_OECONF_X}" + --disable-systemd" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG_class-native = "" +PACKAGECONFIG_class-nativesdk = "" + +# Would like to --enable-systemd but that's a circular build-dependency between +# systemd<->dbus +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" +PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" do_install() { autotools_do_install |