From: leimaohui Date: Sat, 21 Aug 2021 21:41:53 +0000 (+0800) Subject: Fix conflict error when enable multilib. X-Git-Tag: uninative-3.4~121 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=40d131ff65d36022ca604d1153c5948eb888a2e3;p=openembedded-core.git Fix conflict error when enable multilib. 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 Signed-off-by: Richard Purdie --- 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