diff options
| author | leimaohui <leimaohui@fujitsu.com> | 2021-08-22 05:41:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-22 22:21:47 +0100 |
| commit | c40ce02534cc6964d28451129e32164a0c7c2491 (patch) | |
| tree | ca17f33c9a64e46fe687ae7c4add1b6b317e4549 /meta/recipes-core/glibc | |
| parent | 47b361bf915811b87b79f902778595455f676a69 (diff) | |
| download | poky-c40ce02534cc6964d28451129e32164a0c7c2491.tar.gz | |
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
(From OE-Core rev: 40d131ff65d36022ca604d1153c5948eb888a2e3)
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { | |||
| 160 | 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 | 160 | 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 |
| 161 | oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h | 161 | oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h |
| 162 | oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h | 162 | oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h |
| 163 | oe_multilib_header bits/struct_stat.h | 163 | oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h |
| 164 | 164 | ||
| 165 | oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h | 165 | oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h |
| 166 | 166 | ||