[oe-commits] Hongxu Jia : libproxy: let INCOMPATIBLE_LICENSE supports wildcard

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 97f46c97c7f8a39f3691aee423b4192680d114a0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=97f46c97c7f8a39f3691aee423b4192680d114a0

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Mon Dec 15 17:03:28 2014 +0800

libproxy: let INCOMPATIBLE_LICENSE supports wildcard

While wildcard in INCOMPATIBLE_LICENSE, such as INCOMPATIBLE_LICENSE =
"*GPL-3", libproxy could correct work.

[YOCTO #5592]

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>

---

 meta/recipes-support/libproxy/libproxy_0.4.11.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index a53a197..3367c85 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
@@ -29,7 +29,7 @@ do_configure_prepend() {
 }
 
 python() {
-    if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "":
+    if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.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"))
 }