diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2018-04-20 17:07:34 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 13:28:05 +0100 |
| commit | b69c185a671267368d6849d72575f2b6869f412a (patch) | |
| tree | f46778143441c64fc95e5670445c857bd4132639 /meta/recipes-core | |
| parent | 5097cf24f0ac29307ed307ebf0651b7f570fc41e (diff) | |
| download | poky-b69c185a671267368d6849d72575f2b6869f412a.tar.gz | |
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.
(From OE-Core rev: 650c59c8b6796cf4797ca1860be85f6ccf50bcd2)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.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 | 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 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 () { | |||
| 66 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} | 66 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} |
| 67 | fi | 67 | fi |
| 68 | 68 | ||
| 69 | oe_multilib_header bits/syscall.h bits/long-double.h | 69 | oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h |
| 70 | 70 | ||
| 71 | if [ -f ${D}${bindir}/mtrace ]; then | 71 | if [ -f ${D}${bindir}/mtrace ]; then |
| 72 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace | 72 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace |