]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
glibc-package: Fix conflict error when enable multilib.
authorLei Maohui <leimaohui@fujitsu.com>
Tue, 5 Sep 2023 07:07:49 +0000 (15:07 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 6 Sep 2023 16:52:37 +0000 (17:52 +0100)
commitecfa84f5bb238ef2252d6491a6cde2c5fd202213
treec7e3418570ba415570cb532e2ca478beb8c594fd
parentfa66f1cee2d88c2276442e8b4aaeccde5490f9ea
glibc-package: Fix conflict error when enable multilib.

file /usr/include/bits/math-vector.h from install of lib32-libc6-dev-2.38-r0.armv7ahf_neon conflicts with file from package libc6-dev-2.38-r0.aarch64

Reference to the git log of glibc, upstream modified math-vector.h for
aarch64, so this file has many differences from aarch32.
For detailed modifications, please refer to these two commit log of
glibc:
commit 4a9392ffc27ad280f84779eea3ba01f2c134d1d8
commit 78c01a5cbeb6717ffa2d4d66bb90ac5c39bd81a9

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
meta/recipes-core/glibc/glibc-package.inc