dbus: avoid dependency on x11 for -native build
PATCH 1/1 dbus: avoid dependency on x11 for -native build
The native variant already configures --without-x so the X11 libs are redundant. Adjust the DEPENDS to match.
Signed-off-by Phil Blundell <[email protected]>
--- meta/recipes-core/dbus/dbus.inc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus.inc +5 -2
@@ -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; \
Signature · 1 line
1.7.2.5
Richard Purdie
AppliedQuoted 16 lines · Phil Blundell
The native variant already configures --without-x so the X11 libs are redundant. Adjust the DEPENDS to match.
Signed-off-by Phil Blundell <[email protected]>--- meta/recipes-core/dbus/dbus.inc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)meta/recipes-core/dbus/dbus.inc +0
-0@@ -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"
meta/recipes-core/dbus/dbus.inc SECTION = "base" · line 15
Quoted 10 lines
meta/recipes-core/dbus/dbus.inc +5
-2-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