layer.conf: disable conflicting LLVM PACKAGECONFIG options

The LLVM package in OE-Core got optional support for building libclc and
SPIRV-LLVM-Translator. However this also means that llvm-native also
install clang binaries into the sysroot. In order to remove a conflict
with the clang recipe from meta-clang forcibly disable PACKAGECONFIG
options causing conflict.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index eea26f1..065a1c9 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -30,6 +30,12 @@ PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
 PREFERRED_PROVIDER_libunwind = "${@bb.utils.contains_any("TC_CXX_RUNTIME", "llvm android", "libcxx", "libunwind", d)}"
 INHERIT += "clang"
 
+# libclc and SPIRV-LLVM-Trasnaltor from OE-Core/llvm conflict with Clang from
+# meta-clang
+PACKAGECONFIG:remove:pn-llvm = "libclc spirv-llvm-translator"
+PACKAGECONFIG:remove:pn-llvm-native = "libclc spirv-llvm-translator"
+PACKAGECONFIG:remove:pn-nativesdk-llvm = "libclc spirv-llvm-translator"
+
 # Do not include clang in SDK unless user wants to
 CLANGSDK ??= "0"