summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Yiding <liuyd.fnst@fujitsu.com>2025-10-17 13:57:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-10-27 11:37:43 +0000
commit3b89dd24013e28b6372732d13d1cda6d57bfec51 (patch)
treee00c525dfb61123162a6811237d05b4ac6036b68
parent5428cad7d8c69c0e80e67bd4bb91fa34048da8cd (diff)
downloadpoky-3b89dd24013e28b6372732d13d1cda6d57bfec51.tar.gz
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 (From OE-Core rev: 886b0fb60a0b2ebbe3186c790db6e0a41eeb8741) 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>
-rw-r--r--meta/recipes-devtools/clang/llvm_git.bb4
1 files changed, 3 insertions, 1 deletions
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"
13 13
14DEPENDS = "llvm-tblgen-native libffi libxml2 zlib zstd" 14DEPENDS = "llvm-tblgen-native libffi libxml2 zlib zstd"
15 15
16inherit cmake pkgconfig lib_package 16inherit cmake pkgconfig lib_package multilib_header
17 17
18OECMAKE_SOURCEPATH = "${S}/llvm" 18OECMAKE_SOURCEPATH = "${S}/llvm"
19 19
@@ -109,6 +109,8 @@ do_install:append() {
109 109
110 # Reproducibility fixes 110 # Reproducibility fixes
111 sed -i -e 's,${WORKDIR},,g' ${D}/${libdir}/cmake/llvm/LLVMConfig.cmake 111 sed -i -e 's,${WORKDIR},,g' ${D}/${libdir}/cmake/llvm/LLVMConfig.cmake
112
113 oe_multilib_header llvm/Config/llvm-config.h
112} 114}
113 115
114do_install:append:class-native() { 116do_install:append:class-native() {