summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-02-11 23:07:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-18 23:53:55 +0000
commitd40869bbfda2b02b9d1b7d1f5e2ba14b0adb8e80 (patch)
tree359b26b1667a4a4952e8a9b0d88a8e9323217322 /meta/recipes-core/glibc
parent450688b0104ee035813569156805584c4e50ac66 (diff)
downloadpoky-d40869bbfda2b02b9d1b7d1f5e2ba14b0adb8e80.tar.gz
glibc-package.inc: fix multilib headers conflict
Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in glibc-package.inc to fix files conflict: | Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 (From OE-Core rev: 0af9ff84348197b8b314f7c0d3757cab629daa94) Signed-off-by: Kai Kang <kai.kang@windriver.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.inc2
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 3aed7be4f8..285a9aa2f5 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 90 oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.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