aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/eglibc/eglibc-package.inc
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-07-26 14:17:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:39:17 +0100
commit019a33236f76aacb989e8f37b09b81599c27f296 (patch)
tree142e770a9d24fb7877e5580e47fd4ed43fe2501e /meta/recipes-core/eglibc/eglibc-package.inc
parentf7b1ccfaa15e2dd4ff25f2a5f56ac3aff63c7288 (diff)
downloadopenembedded-core-contrib-019a33236f76aacb989e8f37b09b81599c27f296.tar.gz
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 <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-package.inc')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc4
1 files changed, 3 insertions, 1 deletions
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 () {