From: Lei Maohui Date: Tue, 5 Sep 2023 07:07:49 +0000 (+0800) Subject: glibc-package: Fix conflict error when enable multilib. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecfa84f5bb238ef2252d6491a6cde2c5fd202213;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Alexandre Belloni --- diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 7f9e7503a1c..1d4e4c52740 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -87,7 +87,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 + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h bits/math-vector.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