diff options
-rw-r--r-- | 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 11b2abfe51..6d998618d8 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 | ||
9 | DEPENDS = "gconf" | 9 | DEPENDS = "gconf" |
10 | 10 | ||
11 | PR = "r2" | 11 | PR = "r3" |
12 | 12 | ||
13 | SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ | 13 | SRC_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 | ||
33 | python() { | 33 | python() { |
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 | } |