summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-04-17 23:18:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 23:31:29 (GMT)
commit5b78c7d559dd96b414727b85205958bd3f2ece2e (patch)
tree6bc34d389c309db3f41cde368847630bfdafaf0b /meta/recipes-support
parentabddce33ac3a736d497e54cc1c424cbddac27b8e (diff)
downloadpoky-5b78c7d559dd96b414727b85205958bd3f2ece2e.tar.gz
libproxy: remove dependency on gconf when x11 not in DISTRO_FEATURES
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]. (From OE-Core rev: 973351cf2e338f07c11395d494193e9c62857f2d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.7.bb4
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 \
8 8
9DEPENDS = "gconf" 9DEPENDS = "gconf"
10 10
11PR = "r2" 11PR = "r3"
12 12
13SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ 13SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
14 file://g++-namepace.patch \ 14 file://g++-namepace.patch \
@@ -31,7 +31,7 @@ do_configure_prepend() {
31} 31}
32 32
33python() { 33python() {
34 if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1: 34 if base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or base_contains("DISTRO_FEATURES", "x11", "x", "", d) == "":
35 d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) 35 d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no"))
36 d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) 36 d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf"))
37} 37}