From: Liu Yiding <liuyd.fnst@fujitsu.com>
Date: Fri, 17 Oct 2025 05:57:24 +0000 (+0800)
Subject: llvm: multilib-header fix for llvm/Config/llvm-config.h
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=886b0fb60a0b2ebbe3186c790db6e0a41eeb8741;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

llvm: multilib-header fix for llvm/Config/llvm-config.h

Fix following conflicts when enabling multilib.

Error: Transaction test error:
  file /usr/include/llvm/Config/llvm-config.h conflicts between attempted installs of lib32-llvm-dev-21.1.3-r1.core2_32 and llvm-dev-21.1.3-r1.x86_64_v3

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/clang/llvm_git.bb b/meta/recipes-devtools/clang/llvm_git.bb
index 2f47af8d7a..96ea383731 100644
--- a/meta/recipes-devtools/clang/llvm_git.bb
+++ b/meta/recipes-devtools/clang/llvm_git.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
 
 DEPENDS = "llvm-tblgen-native libffi libxml2 zlib zstd"
 
-inherit cmake pkgconfig lib_package
+inherit cmake pkgconfig lib_package multilib_header
 
 OECMAKE_SOURCEPATH = "${S}/llvm"
 
@@ -109,6 +109,8 @@ do_install:append() {
 
     # Reproducibility fixes
     sed -i -e 's,${WORKDIR},,g' ${D}/${libdir}/cmake/llvm/LLVMConfig.cmake
+
+    oe_multilib_header llvm/Config/llvm-config.h
 }
 
 do_install:append:class-native() {