diff options
author | Ross Burton <ross.burton@intel.com> | 2013-12-23 17:32:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-09 11:04:15 +0000 |
commit | f59b445bdece79005680db58274f1e9e2a281c7c (patch) | |
tree | 4f0e96cb29dd57860b3ce64403a8d1b2af6013ae /meta/recipes-core | |
parent | 9797e78a9b327acea54ff2ffbf9baef5647fb059 (diff) | |
download | poky-f59b445bdece79005680db58274f1e9e2a281c7c.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)
(From OE-Core rev: 2e7c07c6b670a68e20e11a22716f2b69e49cac5e)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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" | |||
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;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" | 7 | file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" |
8 | X11DEPENDS = "virtual/libx11 libsm" | 8 | DEPENDS = "expat virtual/libintl" |
9 | DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" | ||
10 | DEPENDS_class-native = "expat-native virtual/libintl-native" | ||
11 | DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl" | ||
12 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" | 9 | RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" |
13 | RDEPENDS_class-native = "" | 10 | RDEPENDS_class-native = "" |
14 | 11 | ||
@@ -72,21 +69,23 @@ pkg_postinst_dbus() { | |||
72 | fi | 69 | fi |
73 | } | 70 | } |
74 | 71 | ||
75 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" | ||
76 | EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch" | ||
77 | # TODO: would like to --enable-systemd but that's a circular build-dependency | ||
78 | # between systemd<->dbus | ||
79 | EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" | ||
80 | |||
81 | EXTRA_OECONF = "--disable-tests \ | 72 | EXTRA_OECONF = "--disable-tests \ |
82 | --disable-checks \ | 73 | --disable-checks \ |
83 | --disable-xml-docs \ | 74 | --disable-xml-docs \ |
84 | --disable-doxygen-docs \ | 75 | --disable-doxygen-docs \ |
85 | --disable-libaudit \ | 76 | --disable-libaudit \ |
86 | --with-xml=expat \ | 77 | --with-xml=expat \ |
87 | --disable-systemd \ | 78 | --disable-systemd" |
88 | ${EXTRA_OECONF_SYSTEMD} \ | 79 | |
89 | ${EXTRA_OECONF_X}" | 80 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
81 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
82 | PACKAGECONFIG_class-native = "" | ||
83 | PACKAGECONFIG_class-nativesdk = "" | ||
84 | |||
85 | # Would like to --enable-systemd but that's a circular build-dependency between | ||
86 | # systemd<->dbus | ||
87 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir" | ||
88 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" | ||
90 | 89 | ||
91 | do_install() { | 90 | do_install() { |
92 | autotools_do_install | 91 | autotools_do_install |