| Submitter | Phil Blundell |
|---|---|
| Date | June 2, 2011, 9:15 a.m. |
| Message ID | <1307006136.2529.166.camel@phil-desktop> |
| Download | mbox | patch |
| Permalink | /patch/5307/ |
| State | New, archived |
| Headers | show |
Comments
On Thu, 2011-06-02 at 10:15 +0100, Phil Blundell wrote: > The native variant already configures --without-x so the X11 libs are > redundant. Adjust the DEPENDS to match. > > Signed-off-by: Phil Blundell <philb@gnu.org> > --- > meta/recipes-core/dbus/dbus.inc | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc > index fb2f6d4..5f9a8a3 100644 > --- a/meta/recipes-core/dbus/dbus.inc > +++ b/meta/recipes-core/dbus/dbus.inc > @@ -5,8 +5,11 @@ 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" > -DEPENDS_virtclass-nativesdk = "expat virtual/libintl virtual/libx11" > +x11deps = "virtual/libx11 libsm" > +basedeps = "expat virtual/libintl" > +DEPENDS = "${basedeps} ${x11deps}" > +DEPENDS_virtclass-native = "${basedeps}" > +DEPENDS_virtclass-nativesdk = "${basedeps} virtual/libx11" > > SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ > file://tmpdir.patch; \ Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index fb2f6d4..5f9a8a3 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -5,8 +5,11 @@ 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" -DEPENDS_virtclass-nativesdk = "expat virtual/libintl virtual/libx11" +x11deps = "virtual/libx11 libsm" +basedeps = "expat virtual/libintl" +DEPENDS = "${basedeps} ${x11deps}" +DEPENDS_virtclass-native = "${basedeps}" +DEPENDS_virtclass-nativesdk = "${basedeps} virtual/libx11" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \
The native variant already configures --without-x so the X11 libs are redundant. Adjust the DEPENDS to match. Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/recipes-core/dbus/dbus.inc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)