From: zhengruoqin Date: Fri, 19 Feb 2021 01:36:47 +0000 (+0800) Subject: glibc: Unify wordsize.h with arm multilibs X-Git-Tag: yocto-3.3~435 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=cf487df7d58ea89fcef5c4bc30c2ca1ceded9508;p=openembedded-core.git glibc: Unify wordsize.h with arm multilibs wordsize.h should be the same under arm and aarch64, othersise the following error happens: "file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.33-r0.armv7ahf_neon and libc6-dev-2.33-r0.aarch64" Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 791029c4c0..11a77cdf93 100644 --- a/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -50,7 +50,7 @@ index 91da566b74..34fcdef1f1 100644 /* Determine the wordsize from the preprocessor defines. - Copyright (C) 2016-2021 Free Software Foundation, Inc. -+ Copyright (C) 2016-2020 Free Software Foundation, Inc. ++ Copyright (C) 2016-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or