diff options
| author | Lei Maohui <leimaohui@fujitsu.com> | 2023-09-05 15:07:49 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-06 17:52:45 +0100 |
| commit | 71d83f653a3228059f8f1c663d4a9a863a242618 (patch) | |
| tree | eab64e66a62656f39acf9da0acd315b72b259762 /meta/recipes-core/glibc | |
| parent | e953b98c9fd1244dba6597aa2cc395e6ed3a2b38 (diff) | |
| download | poky-71d83f653a3228059f8f1c663d4a9a863a242618.tar.gz | |
glibc-package: Fix conflict error when enable multilib.
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
(From OE-Core rev: ecfa84f5bb238ef2252d6491a6cde2c5fd202213)
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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 7f9e7503a1..1d4e4c5274 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
| @@ -87,7 +87,7 @@ do_install() { | |||
| 87 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} | 87 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} |
| 88 | fi | 88 | fi |
| 89 | 89 | ||
| 90 | oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h | 90 | oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h bits/math-vector.h |
| 91 | 91 | ||
| 92 | if [ -f ${D}${bindir}/mtrace ]; then | 92 | if [ -f ${D}${bindir}/mtrace ]; then |
| 93 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace | 93 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace |