Skip to contentSkip to conversation

glibc: Fix conflict errors when enable multilib.

PATCH New leimaohui 1 participant 3 messages Aug 21, 2021

lore
Share & tools
lore

leimaohui

author
#0 lore raw

cover glibc: Fix conflict errors when enable multilib.

- Fix a miss in 0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch.
- Added new file bits/pthread_stack_min.h to oe_multilib_header.

Lei Maohui (2):
wordsize.h: Fix a miss, this file in arm and aarch64 should be the
same.
Fix conflict error when enable multilib.

 meta/recipes-core/glibc/glibc-package.inc                 | 2 +-
 ...dsize.h-Unify-the-header-between-arm-and-aarch64.patch | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/2 wordsize.h: Fix a miss, this file in arm and aarch64 should be the same.

---
 ...dsize.h-Unify-the-header-between-arm-and-aarch64.patch | 8 --------
 1 file changed, 8 deletions(-)
meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +0 -8
index 8e011699ef..ece792509e 100644
@@ -46,14 +46,6 @@ copy to sysdeps/arm/bits/wordsize.h
 index 91da566b74..34fcdef1f1 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-2021 Free Software Foundation, Inc.
-+   Copyright (C) 2016-2020 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/>.  */
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 2/2 Fix conflict error when enable multilib.

In reply to leimaohui

file /usr/include/bits/pthread_stack_min.h conflicts between attempted installs of libc6-dev-2.34-r0.aarch64 and lib32-libc6-dev-2.34-r0.armv7ahf_neon

---
 meta/recipes-core/glibc/glibc-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-package.inc +1 -1
index 56fbf8b08c..e25561d9b9 100644
@@ -160,7 +160,7 @@ do_install_armmultilib () {
 	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
 	oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h
-	oe_multilib_header bits/struct_stat.h
+	oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h
 
 	oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h
 
Signature · 1 line
2.25.1