summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-12-02 14:32:42 +0000
committerKhem Raj <raj.khem@gmail.com>2019-12-07 00:01:39 -0800
commit4fe4ef97f24f2ac0aee1b1483a191d267c29ad4d (patch)
treef0084bdbea15543361be4d96168df75d908782dc
parent9315ab76e68093779f553db3f9275de17a2dd15b (diff)
downloadmeta-clang-4fe4ef97f24f2ac0aee1b1483a191d267c29ad4d.tar.gz
packagegroup: be lenient about CLANGSDK setting
As CLANGSDK defaults to '1', users who have not read the README may think that setting it to '0' would disable adding Clang to the SDK. Little do they know that you need to *unset* the value for this to work (as bool('0') -> True). Change the logic to use bb.utils.contains(), so that '0' is not true. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend2
-rw-r--r--recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
index 3472eb3..0c8ae6c 100644
--- a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
+++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -1 +1 @@
RDEPENDS_${PN} += "${@'nativesdk-clang' if '${CLANGSDK}' else ''}" RDEPENDS_${PN} += "${@bb.utils.contains('CLANGSDK', '1', 'nativesdk-clang', '', d)}"
diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
index 2a727e0..59f0959 100644
--- a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
+++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
@@ -1 +1 @@
RRECOMMENDS_${PN} += "${@'libcxx-dev libcxx-staticdev compiler-rt-dev compiler-rt-staticdev' if '${CLANGSDK}' else ''}" RRECOMMENDS_${PN} += "${@bb.utils.contains('CLANGSDK', '1', 'libcxx-dev libcxx-staticdev compiler-rt-dev compiler-rt-staticdev', '', d)}"