]> code.ossystems Code Review - openembedded-core.git/commitdiff
libproxy: let INCOMPATIBLE_LICENSE supports wildcard
authorHongxu Jia <hongxu.jia@windriver.com>
Mon, 15 Dec 2014 09:03:28 +0000 (17:03 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 19 Dec 2014 17:54:14 +0000 (17:54 +0000)
While wildcard in INCOMPATIBLE_LICENSE, such as INCOMPATIBLE_LICENSE =
"*GPL-3", libproxy could correct work.

[YOCTO #5592]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
meta/recipes-support/libproxy/libproxy_0.4.11.bb

index a53a197615c9da4e2a0fc6dbc76f8e44df1b1e37..3367c8515663bd5eb29ac1db3a204e193b895ea2 100644 (file)
@@ -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"))
 }