diff options
| author | zhengruoqin <zhengrq.fnst@cn.fujitsu.com> | 2021-02-19 09:35:30 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-21 22:01:28 +0000 |
| commit | 48a789c4e03e5eb9c50c1bb129403d94648f8c05 (patch) | |
| tree | 57cd9090144549c63b87025d9560d56a3eb559db /meta/recipes-core | |
| parent | d920e8cb33bc82945cefa2371c5a491dd28fd1b4 (diff) | |
| download | poky-48a789c4e03e5eb9c50c1bb129403d94648f8c05.tar.gz | |
glibc-package.inc: Fix arm multlib header issue with struct_stat.h
Fix build error under multilib as following:
"file /usr/include/bits/struct_stat.h conflicts between attempted installs of lib32-libc6-dev-2.33-r0.armv7ahf_neon and libc6-dev-2.33-r0.aarch64"
(From OE-Core rev: 163ec51715e939fe9ff3f87c2af46a77e1a8edea)
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index f7e4b59a5b..8d0cc8047f 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
| @@ -156,6 +156,7 @@ do_install_armmultilib () { | |||
| 156 | 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 | 156 | 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 |
| 157 | oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h | 157 | oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h |
| 158 | oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h | 158 | oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h |
| 159 | oe_multilib_header bits/struct_stat.h | ||
| 159 | 160 | ||
| 160 | oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h | 161 | oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h |
| 161 | 162 | ||