]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
glibc: fix header file conflict in case of multilib
authorChen Qi <Qi.Chen@windriver.com>
Tue, 11 Feb 2025 01:59:49 +0000 (17:59 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 17 Feb 2025 22:06:55 +0000 (22:06 +0000)
commite13d464db8db4e0fdec6c076aecff5284a27c510
tree94a919bc117b175f68d09ce5a3d28dd38ea72147
parent3820f6f342c2309ba7d51d3c08b3a951c2c17781
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.

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>
meta/recipes-core/glibc/glibc-package.inc