[oe-commits] [openembedded-core] 05/06: glibc: Make bits/wordsize.h multilibbed again

[git at git.openembedded.org]

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

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

commit 056ae940da49b38890c2960651f0fdb5331a5fac
Author: Daniel Díaz <daniel.diaz at linaro.org>
AuthorDate: Tue Aug 14 11:14:35 2018 -0500

    glibc: Make bits/wordsize.h multilibbed again
    
    As reported by ChenQi, leaving bits/wordsize.h out of being
    multilibbed introduced a problem in building the SDK for
    arm64:
      Error: Transaction check error:
        file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.27-r0.armv7vet2hf_vfp and libc6-dev-2.27-r0.aarch64
    
    This effectively reverts commit a74c77d6.
    
    (From OE-Core rev: 90ad502bf8faa233e25cf297c1eeefcb0367aea3)
    
    Signed-off-by: Daniel Díaz <daniel.diaz at linaro.org>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 35f5231..c1d186a 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -137,7 +137,7 @@ do_install_append_armeb () {
 }
 
 do_install_armmultilib () {
-	oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h
+	oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h
 	oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h  bits/sem.h  bits/semaphore.h bits/setjmp.h
 	oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h
 

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