diff options
author | zhengruoqin <zhengrq.fnst@cn.fujitsu.com> | 2021-02-19 09:36:47 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-21 21:59:52 +0000 |
commit | cf487df7d58ea89fcef5c4bc30c2ca1ceded9508 (patch) | |
tree | 0715ab2c30e7c499b211b2d8368c54f9eed4718b | |
parent | 163ec51715e939fe9ff3f87c2af46a77e1a8edea (diff) | |
download | openembedded-core-contrib-cf487df7d58ea89fcef5c4bc30c2ca1ceded9508.tar.gz |
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 <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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 |