* [PATCH 0/2] Use oe_multilib_headers to avoid header file conflicts
@ 2018-04-20 9:07 Chen Qi
2018-04-20 9:07 ` [PATCH 1/2] glibc: use oe_multilib_header on bits/floatn.h Chen Qi
2018-04-20 9:07 ` [PATCH 2/2] linux-libc-headers: multilib_header asm/kvm_para.h and asm/bpf_perf_event.h Chen Qi
0 siblings, 2 replies; 3+ messages in thread
From: Chen Qi @ 2018-04-20 9:07 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 71b4ae25612d6dd3687fdd583ed0077e744899cb:
glib-2.0/glib.inc: fix broken mingw build (2018-04-20 08:19:46 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/multilib_headers
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/multilib_headers
Chen Qi (2):
glibc: use oe_multilib_header on bits/floatn.h
linux-libc-headers: multilib_header asm/kvm_para.h and
asm/bpf_perf_event.h
meta/recipes-core/glibc/glibc-package.inc | 2 +-
meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] glibc: use oe_multilib_header on bits/floatn.h
2018-04-20 9:07 [PATCH 0/2] Use oe_multilib_headers to avoid header file conflicts Chen Qi
@ 2018-04-20 9:07 ` Chen Qi
2018-04-20 9:07 ` [PATCH 2/2] linux-libc-headers: multilib_header asm/kvm_para.h and asm/bpf_perf_event.h Chen Qi
1 sibling, 0 replies; 3+ messages in thread
From: Chen Qi @ 2018-04-20 9:07 UTC (permalink / raw)
To: openembedded-core
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>
---
meta/recipes-core/glibc/glibc-package.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index ff45dfe..728bc53 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
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] linux-libc-headers: multilib_header asm/kvm_para.h and asm/bpf_perf_event.h
2018-04-20 9:07 [PATCH 0/2] Use oe_multilib_headers to avoid header file conflicts Chen Qi
2018-04-20 9:07 ` [PATCH 1/2] glibc: use oe_multilib_header on bits/floatn.h Chen Qi
@ 2018-04-20 9:07 ` Chen Qi
1 sibling, 0 replies; 3+ messages in thread
From: Chen Qi @ 2018-04-20 9:07 UTC (permalink / raw)
To: openembedded-core
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/asm/bpf_perf_event.h conflicts between attempted installs of lib32-linux-libc-headers-dev-4.15.7-r0.armv7vehf_vfp and linux-libc-headers-dev-4.15.7-r0.aarch64
file /usr/include/asm/kvm_para.h conflicts between attempted installs of lib32-linux-libc-headers-dev-4.15.7-r0.armv7vehf_vfp and linux-libc-headers-dev-4.15.7-r0.aarch64
Apply oe_multilib_header on these header files to fix the problem.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 1657df6..9903c06 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -78,7 +78,7 @@ do_install_append_arm () {
}
do_install_armmultilib () {
- oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/mman.h asm/param.h asm/perf_regs.h
+ oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h
oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-20 9:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-20 9:07 [PATCH 0/2] Use oe_multilib_headers to avoid header file conflicts Chen Qi
2018-04-20 9:07 ` [PATCH 1/2] glibc: use oe_multilib_header on bits/floatn.h Chen Qi
2018-04-20 9:07 ` [PATCH 2/2] linux-libc-headers: multilib_header asm/kvm_para.h and asm/bpf_perf_event.h Chen Qi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.