diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2025-02-10 17:59:49 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-18 11:56:04 +0000 |
| commit | 76e071a79b8f0e2ce9010725297db4b01fd9ec62 (patch) | |
| tree | 3c907b85a9a344d49f97cd6b100f962260d08a56 /meta | |
| parent | af38235305fc2ac59a82f0413a1fe4cc5161ff86 (diff) | |
| download | poky-76e071a79b8f0e2ce9010725297db4b01fd9ec62.tar.gz | |
glibc: fix header file conflict in case of multilib
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.
(From OE-Core rev: e13d464db8db4e0fdec6c076aecff5284a27c510)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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() { | |||
| 88 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} | 88 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} |
| 89 | fi | 89 | fi |
| 90 | 90 | ||
| 91 | oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h bits/math-vector.h | 91 | 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 |
| 92 | 92 | ||
| 93 | if [ -f ${D}${bindir}/mtrace ]; then | 93 | if [ -f ${D}${bindir}/mtrace ]; then |
| 94 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace | 94 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace |