[OE-core] [PATCH 1/1] libproxy: remove dependency on gconf when x11 not in DISTRO_FEATURES

[Andreas Oberritter]

On 18.04.2012 01:18, Paul Eggleton wrote:
> This allows libzypp to successfully build when x11 is not in
> DISTRO_FEATURES (avoiding the libzypp -> libproxy -> gconf -> gtk+
> dependency chain which without X results in gtk+ failing at
> do_configure).
> 
> Fixes [YOCTO #2320].
> 
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
> ---
>  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 11b2abf..6d99861 100644
> --- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
> +++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
> @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
>  
>  DEPENDS = "gconf"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
>             file://g++-namepace.patch \
> @@ -31,7 +31,7 @@ do_configure_prepend() {
>  }
>  
>  python() {
> -    if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
> +    if base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or base_contains("DISTRO_FEATURES", "x11", "x", "", d) == "":
>          d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no"))
>          d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf"))
>  }

A very similar patch I submitted was rejected, because this problem
should be solved using PACKAGECONFIG.

See
http://git.openembedded.org/openembedded-core-contrib/commit/?h=obi/current&id=224921423b6bcd7dc7e8570a4f3d8b3ba1291720

Has something changed since when I submitted the patch? Should I resend
my patches to remove gconf etc. dependencies when x11 is not defined?

See patches 7 through 11 at
http://git.openembedded.org/openembedded-core-contrib/log/?h=obi/current

Regards,
Andreas