Skip to contentSkip to conversation

glibc-package: Fix conflict error when enable multilib.

PATCH New [email protected] 1 participant 1 message Sep 5, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 glibc-package: Fix conflict error when enable multilib.

From: Lei Maohui <[email protected]>

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

---
 meta/recipes-core/glibc/glibc-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-package.inc +1 -1
index 7f9e7503a1..1d4e4c5274 100644
@@ -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
Signature · 1 line
2.25.1