From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Phil Blundell <philb@gnu.org>
Subject: Re: dbus: only use x11 if DISTRO_FEATURES has selected it
Date: Mon, 15 Aug 2011 10:07:36 -0700 [thread overview]
Message-ID: <4E495258.1030708@linux.intel.com> (raw)
In-Reply-To: <1313164784.6733.165.camel@phil-desktop>
On 08/12/2011 08:59 AM, Phil Blundell wrote:
> This makes it possible to include dbus in a non-X11-equipped DISTRO.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
> 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 \
Merged into OE-Core
Thanks
Sau!
next prev parent reply other threads:[~2011-08-15 17:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-12 15:59 dbus: only use x11 if DISTRO_FEATURES has selected it Phil Blundell
2011-08-15 17:07 ` Saul Wold [this message]
2012-10-25 4:08 ` Denys Dmytriyenko
2012-10-25 9:26 ` Burton, Ross
2012-10-25 9:58 ` Paul Eggleton
2012-10-25 11:44 ` Richard Purdie
-- strict thread matches above, loose matches on Subject: below --
2011-08-16 5:49 James Limbouris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E495258.1030708@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=philb@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox