aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-02-21 22:35:37 +0100
committerAndreas Oberritter <obi@opendreambox.org>2012-05-10 22:05:57 +0200
commitbbd9ff03c0fa73a2a90c139ff37020060c5e294a (patch)
tree79a0131e7d907864bbe8c5050614c480644af951
parentb6d4946d79ebddbce2655eb35c6d6ebe7e72ab46 (diff)
downloadopenembedded-core-contrib-bbd9ff03c0fa73a2a90c139ff37020060c5e294a.tar.gz
libsoup-2.4: don't depend on libgnome-keyring unless x11 is defined
* Drop dependency on GNOME if x11 is disabled. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb
index 8e6ef2630c..d9a8457377 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb
@@ -6,9 +6,9 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
-DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring"
+DEPENDS = "glib-2.0 gnutls libxml2 libproxy ${@base_contains('DISTRO_FEATURES', 'x11', 'libgnome-keyring sqlite3', '', d)}"
SRC_URI = "${GNOME_MIRROR}/libsoup/2.36/libsoup-${PV}.tar.bz2"
@@ -19,3 +19,4 @@ S = "${WORKDIR}/libsoup-${PV}"
inherit autotools pkgconfig
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-gnome', '--without-gnome', d)}"