| Message ID | 20230209100011.2101196-1-yi.zhao@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | 303bb3b735da434eb135ee857c2c49c55da61918 |
| Headers | show |
| Series | glibc: unify wordsize.h between arm and aarch64 | expand |
thanks for finding and fixing it. It has happened with every upgrade that this file goes out of sync due to copyright headers change. its perhaps worth trying to use a symlink instead try this patch and see if it works in your settings https://uclibc.org/~kraj/0001-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch if it does then we should use this instead of the original patch On Thu, Feb 9, 2023 at 2:00 AM Yi Zhao <yi.zhao@eng.windriver.com> wrote: > > There is a redundant change in > 0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch that > causes wordsize.h to be different in arm and aarch64. This causes the > build error when enable multilib: > > Error: Transaction test error: > file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.37-r0.armv7vet2hf_vfp and libc6-dev-2.37-r0.cortexa57 > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > --- > ...y-the-header-between-arm-and-aarch64.patch | 20 ++++++------------- > 1 file changed, 6 insertions(+), 14 deletions(-) > > diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > index 9ed89c93da..90a6cc2363 100644 > --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > @@ -11,10 +11,10 @@ Upstream-Status: Inappropriate [ OE-Specific ] > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > - sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- > - sysdeps/{aarch64 => arm}/bits/wordsize.h | 10 +++++++--- > - 2 files changed, 13 insertions(+), 5 deletions(-) > - copy sysdeps/{aarch64 => arm}/bits/wordsize.h (80%) > + sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- > + sysdeps/{aarch64 => arm}/bits/wordsize.h | 8 ++++++-- > + 2 files changed, 12 insertions(+), 4 deletions(-) > + copy sysdeps/{aarch64 => arm}/bits/wordsize.h (85%) > > diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h > index 04d4be9519..63876a7830 100644 > @@ -40,20 +40,12 @@ index 04d4be9519..63876a7830 100644 > > #define __WORDSIZE_TIME64_COMPAT32 0 > diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h > -similarity index 80% > +similarity index 85% > copy from sysdeps/aarch64/bits/wordsize.h > copy to sysdeps/arm/bits/wordsize.h > -index 04d4be9519..5ef0ed21f3 100644 > +index 04d4be9519..63876a7830 100644 > --- a/sysdeps/aarch64/bits/wordsize.h > +++ b/sysdeps/arm/bits/wordsize.h > -@@ -1,6 +1,6 @@ > - /* Determine the wordsize from the preprocessor defines. > - > -- Copyright (C) 2016-2023 Free Software Foundation, Inc. > -+ Copyright (C) 2016-2022 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 > @@ -17,12 +17,16 @@ > License along with the GNU C Library; if not, see > <https://www.gnu.org/licenses/>. */ > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#176937): https://lists.openembedded.org/g/openembedded-core/message/176937 > Mute This Topic: https://lists.openembedded.org/mt/96850115/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 9ed89c93da..90a6cc2363 100644 --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -11,10 +11,10 @@ Upstream-Status: Inappropriate [ OE-Specific ] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- - sysdeps/{aarch64 => arm}/bits/wordsize.h | 10 +++++++--- - 2 files changed, 13 insertions(+), 5 deletions(-) - copy sysdeps/{aarch64 => arm}/bits/wordsize.h (80%) + sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- + sysdeps/{aarch64 => arm}/bits/wordsize.h | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + copy sysdeps/{aarch64 => arm}/bits/wordsize.h (85%) diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index 04d4be9519..63876a7830 100644 @@ -40,20 +40,12 @@ index 04d4be9519..63876a7830 100644 #define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h -similarity index 80% +similarity index 85% copy from sysdeps/aarch64/bits/wordsize.h copy to sysdeps/arm/bits/wordsize.h -index 04d4be9519..5ef0ed21f3 100644 +index 04d4be9519..63876a7830 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/arm/bits/wordsize.h -@@ -1,6 +1,6 @@ - /* Determine the wordsize from the preprocessor defines. - -- Copyright (C) 2016-2023 Free Software Foundation, Inc. -+ Copyright (C) 2016-2022 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 @@ -17,12 +17,16 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */
There is a redundant change in 0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch that causes wordsize.h to be different in arm and aarch64. This causes the build error when enable multilib: Error: Transaction test error: file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.37-r0.armv7vet2hf_vfp and libc6-dev-2.37-r0.cortexa57 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...y-the-header-between-arm-and-aarch64.patch | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-)