From 019a33236f76aacb989e8f37b09b81599c27f296 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 26 Jul 2011 14:17:11 -0500 Subject: eglibc_2.13: Resolve multilib header conflicts Due to mismatches between various header definitions in i386 and x86_64 we need to overwrite the i386 versions of the headers with their x86_64 equivalents. This can not be done for the syscall.h as it's dynamically generated, so use the header conflict resolution helper for that. Signed-off-by: Mark Hatle --- meta/recipes-core/eglibc/eglibc-package.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/eglibc/eglibc-package.inc') diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 9e71150ca2..a995f4f610 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -86,10 +86,12 @@ SUMMARY_eglibc-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_eglibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" -inherit libc-common +inherit libc-common multilib_header do_install_append () { rm -f ${D}${sysconfdir}/localtime + + oe_multilib_header bits/syscall.h } do_install_locale () { -- cgit 1.2.3-korg