mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-05 05:04:44 +02:00
clang: multilib-header fix for llvm/Config/llvm-config.h and clang/Config/config.h
Error: Transaction test error: file /usr/include/clang/Config/config.h conflicts between attempted installs of lib32-clang-dev-20.1.4-r0.core2_32 and clang-dev-20.1.4-r0.core2_64 file /usr/include/llvm/Config/llvm-config.h conflicts between attempted installs of lib32-clang-dev-20.1.4-r0.core2_32 and clang-dev-20.1.4-r0.core2_64 reproduce steps: 1. Add in local.conf the following lines: MACHINE ?= "qemux86-64" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 ?= "core2-32" 2. add lib32-llvm-dev llvm-dev to core-image-minimal.bb IMAGE_INSTALL = "packagegroup-core-boot ${CORE_IMAGE_EXTRA_INSTALL} lib32-clang-dev clang-dev" 3. $ bitbake core-image-minimal (From OE-Core rev: e2631fd1b47ed2d2b877426c4f253e6edea24ece) Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6ae605e343
commit
ff5f8a4744
|
@ -22,7 +22,7 @@ INHIBIT_DEFAULT_DEPS:class-native = "1"
|
|||
LDFLAGS:append:class-target:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
|
||||
LDFLAGS:append:class-target:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
|
||||
|
||||
inherit cmake pkgconfig python3native python3targetconfig
|
||||
inherit cmake pkgconfig python3native python3targetconfig multilib_header
|
||||
|
||||
OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
|
||||
|
||||
|
@ -237,6 +237,9 @@ do_install:append() {
|
|||
install -Dm 0755 ${B}${BINPATHPREFIX}/bin/$t ${D}${bindir}/$t
|
||||
fi
|
||||
done
|
||||
|
||||
oe_multilib_header llvm/Config/llvm-config.h
|
||||
oe_multilib_header clang/Config/config.h
|
||||
}
|
||||
|
||||
do_install:append:class-target () {
|
||||
|
|
Loading…
Reference in New Issue
Block a user