[oe-commits] [openembedded-core] 42/73: glibc: use oe_multilib_header on bits/floatn.h

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 501595601a1259cca0d51bf246a7a3406a53da37
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Fri Apr 20 17:07:34 2018 +0800

    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.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.