[1.2] Allow building libzypp without x11 in DISTRO_FEATURES

The following changes since commit 70541d5e82ee05289eb0095bed4b121d12a00729:

self-hosted-image: remove BB_NO_NETWORK and update Poky SRCREV (2012-04-17 23:16:07 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/libproxy-nox
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/libproxy-nox

Paul Eggleton (1):
libproxy: remove dependency on gconf when x11 not in DISTRO_FEATURES

 meta/recipes-support/libproxy/libproxy_0.4.7.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

1.7.5.4

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].

---
 meta/recipes-support/libproxy/libproxy_0.4.7.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 11b2abf..6d99861 100644
@@ -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"))
 }

1.7.5.4

It should still be. I had not seen your patch, but this was fixed in this manner because I discovered builds without x11 were broken and a fix was needed urgently; I elected to fix it by by adjusting the conditional code that was already there so that the change was kept simple. We do still want to fix this using PACKAGECONFIG after the Yocto Project 1.2 release; however this will involve the code that handles PACKAGECONFIG being extended to work together with cmake.

Cheers,
Paul

Paul Eggleton
Intel Open Source Technology Centre

Merged into OE-Core

Thanks
Sau!