Patchwork [2/5] libproxy: don't depend on gconf unless x11 is defined

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 22, 2012, 11:26 a.m.
Message ID <1329910007-8441-3-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/21569/
State New
Headers show

Comments

Andreas Oberritter - Feb. 22, 2012, 11:26 a.m.
* Drop dependency on GNOME if x11 is disabled.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-support/libproxy/libproxy_0.4.7.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Koen Kooi - Feb. 22, 2012, 12:57 p.m.
Op 22 feb. 2012, om 12:26 heeft Andreas Oberritter het volgende geschreven:

> * Drop dependency on GNOME if x11 is disabled.
> 
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> meta/recipes-support/libproxy/libproxy_0.4.7.bb |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
> index f31b701..659100d 100644
> --- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
> +++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
> @@ -6,9 +6,9 @@ LICENSE = "LGPLv2.1+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
>                     file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
> 
> -DEPENDS = "gconf"
> +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'gconf', '', d)}"

that one likely needs a --disable-something to be deterministic.

regards,

Koen

Patch

diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
index f31b701..659100d 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
@@ -6,9 +6,9 @@  LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
                     file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
 
-DEPENDS = "gconf"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'gconf', '', d)}"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"