diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-07-26 14:17:11 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 15:45:48 +0100 |
commit | ac236b02d9ad43e3122cce7cb92bdbf5deeceabf (patch) | |
tree | 62c362fa933d6b1a8ccb3155b3b6ed205a43e022 /meta/recipes-core/eglibc/eglibc-package.inc | |
parent | e17f834f16c0a5e5f6b62c898316b082b6cf7362 (diff) | |
download | poky-ac236b02d9ad43e3122cce7cb92bdbf5deeceabf.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.
(From OE-Core rev: 019a33236f76aacb989e8f37b09b81599c27f296)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-package.inc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 4 |
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" | |||
86 | DESCRIPTION_eglibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." | 86 | DESCRIPTION_eglibc-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." |
87 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" | 87 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" |
88 | 88 | ||
89 | inherit libc-common | 89 | inherit libc-common multilib_header |
90 | 90 | ||
91 | do_install_append () { | 91 | do_install_append () { |
92 | rm -f ${D}${sysconfdir}/localtime | 92 | rm -f ${D}${sysconfdir}/localtime |
93 | |||
94 | oe_multilib_header bits/syscall.h | ||
93 | } | 95 | } |
94 | 96 | ||
95 | do_install_locale () { | 97 | do_install_locale () { |