From: Chen Qi <qi.c...@windriver.com>
When enabling multilib for qemuarm64, populate_sdk would fail with
the following error:
Error: Transaction test error: file /usr/include/bits/indirect-return.h
conflicts between installs of lib32-libc6-dev-2.41 and libc6-dev-2.41+
The problem could be reproduced by adding the following lines in
local.conf and then run 'bitbake core-image-minimal -c populate_sdk':
MACHINE ?= "qemuarm64"
require conf/multilib.conf
MULTILIBS ?= "multilib:lib32"
DEFAULTTUNE:virtclass-multilib-lib32 ?= "armv7athf-neon"
Use oe_multilib_header to handle bits/indrect-return.h to fix this
issue.
Signed-off-by: Chen Qi <qi.c...@windriver.com>
---
meta/recipes-core/glibc/glibc-package.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index bba9449d34..21f2200d19 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -88,7 +88,7 @@ do_install() {
rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
fi
- oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h
bits/endianness.h bits/struct_rwlock.h bits/math-vector.h
+ oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h
bits/endianness.h bits/struct_rwlock.h bits/math-vector.h bits/indirect-return.h
if [ -f ${D}${bindir}/mtrace ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e
'2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#211123):
https://lists.openembedded.org/g/openembedded-core/message/211123
Mute This Topic: https://lists.openembedded.org/mt/111115199/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
