file /usr/include/bits/pthread_stack_min.h conflicts between attempted installs 
of libc6-dev-2.34-r0.aarch64 and lib32-libc6-dev-2.34-r0.armv7ahf_neon

Signed-off-by: Lei Maohui <[email protected]>
---
 meta/recipes-core/glibc/glibc-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc 
b/meta/recipes-core/glibc/glibc-package.inc
index 56fbf8b08c..e25561d9b9 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -160,7 +160,7 @@ do_install_armmultilib () {
        oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h 
bits/pthreadtypes.h bits/pthreadtypes-arch.h  bits/sem.h  bits/semaphore.h 
bits/setjmp.h
        oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h 
bits/typesizes.h
        oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h
-       oe_multilib_header bits/struct_stat.h
+       oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h
 
        oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h
 
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155056): 
https://lists.openembedded.org/g/openembedded-core/message/155056
Mute This Topic: https://lists.openembedded.org/mt/85040999/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to