summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@cn.fujitsu.com>2021-02-19 09:36:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-21 22:01:28 +0000
commit10629a04bc4cb021fded00f095e2f86605991b81 (patch)
treed17f89acd55ddf15542249c5fe547a1c534f5651 /meta/recipes-core
parent48a789c4e03e5eb9c50c1bb129403d94648f8c05 (diff)
downloadpoky-10629a04bc4cb021fded00f095e2f86605991b81.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" (From OE-Core rev: cf487df7d58ea89fcef5c4bc30c2ca1ceded9508) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch2
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
50 /* Determine the wordsize from the preprocessor defines. 50 /* Determine the wordsize from the preprocessor defines.
51 51
52- Copyright (C) 2016-2021 Free Software Foundation, Inc. 52- Copyright (C) 2016-2021 Free Software Foundation, Inc.
53+ Copyright (C) 2016-2020 Free Software Foundation, Inc. 53+ Copyright (C) 2016-2021 Free Software Foundation, Inc.
54 This file is part of the GNU C Library. 54 This file is part of the GNU C Library.
55 55
56 The GNU C Library is free software; you can redistribute it and/or 56 The GNU C Library is free software; you can redistribute it and/or