summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-04-20 17:07:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 09:54:58 +0100
commit650c59c8b6796cf4797ca1860be85f6ccf50bcd2 (patch)
treeef901a7892fcb95eef58690c9a8e22cff565daa2 /meta/recipes-core/glibc
parentde4206c6fd0c3be77d71958f532604b65a4dd5be (diff)
downloadopenembedded-core-contrib-650c59c8b6796cf4797ca1860be85f6ccf50bcd2.tar.gz
openembedded-core-contrib-650c59c8b6796cf4797ca1860be85f6ccf50bcd2.tar.bz2
openembedded-core-contrib-650c59c8b6796cf4797ca1860be85f6ccf50bcd2.zip
glibc: use oe_multilib_header on bits/floatn.h
When building SDK via populate_sdk for qemuarm64 with multilib enabled, we would have conflict about bits/floatn.h at populate_sdk time. file /usr/include/bits/floatn.h conflicts between attempted ins talls of libc6-dev-2.27-r0.aarch64 and lib32-libc6-dev-2.27-r0.armv7vehf_vfp Apply oe_multilib_header on this header file to fix the problem. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
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 ff45dfe35a..728bc5381f 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -66,7 +66,7 @@ do_install_append () {
rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
fi
- oe_multilib_header bits/syscall.h bits/long-double.h
+ oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h
if [ -f ${D}${bindir}/mtrace ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace