[PATCH] glibc: fix multilib headers conflict for arm

[PATCH] glibc: fix multilib headers conflict for arm

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

The header files conflic when multilib enabled for arm:

| Error: Transaction test error:
|   file /usr/include/finclude/math-vector-fortran.h conflicts between attempted installs of
    lib32-libc6-dev-2.39+git0+312e159626-r0.armv7at2hf_neon and libc6-dev-2.39+git0+312e159626-r0.cortexa72

Invoke function oe_multilib_header to resolve it.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/recipes-core/glibc/glibc-package.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 1ef987be0a..fa085f31d2 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -167,6 +167,8 @@ do_install_armmultilib () {
 	oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h
 
 	oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h
+
+	oe_multilib_header finclude/math-vector-fortran.h
 }
 
 
-- 
2.34.1

Re: [OE-core] [PATCH] glibc: fix multilib headers conflict for arm

[Richard Purdie]

On Mon, 2024-03-04 at 09:12 +0800, Kai Kang wrote:
> From: Kai Kang <kai.kang@windriver.com>
> 
> The header files conflic when multilib enabled for arm:
> 
> > Error: Transaction test error:
> >   file /usr/include/finclude/math-vector-fortran.h conflicts between attempted installs of
>     lib32-libc6-dev-2.39+git0+312e159626-r0.armv7at2hf_neon and libc6-dev-2.39+git0+312e159626-r0.cortexa72
> 
> Invoke function oe_multilib_header to resolve it.
> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  meta/recipes-core/glibc/glibc-package.inc | 2 ++
>  1 file changed, 2 insertions(+)

It may fix conflicts but it appears to break the fortran compiler:

https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/2987/steps/14/logs/stdio

I've not specifically bisected it to this but it does seem most likely.

Cheers,

Richard

Re: [OE-core] [PATCH] glibc: fix multilib headers conflict for arm

[Kai]

On 3/5/24 01:00, Richard Purdie wrote:
> On Mon, 2024-03-04 at 09:12 +0800, Kai Kang wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> The header files conflic when multilib enabled for arm:
>>
>>> Error: Transaction test error:
>>>    file /usr/include/finclude/math-vector-fortran.h conflicts between attempted installs of
>>      lib32-libc6-dev-2.39+git0+312e159626-r0.armv7at2hf_neon and libc6-dev-2.39+git0+312e159626-r0.cortexa72
>>
>> Invoke function oe_multilib_header to resolve it.
>>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>>   meta/recipes-core/glibc/glibc-package.inc | 2 ++
>>   1 file changed, 2 insertions(+)
> It may fix conflicts but it appears to break the fortran compiler:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/2987/steps/14/logs/stdio
>
> I've not specifically bisected it to this but it does seem most likely.

OK. I'll figure it out.

Regards,
kai

>
> Cheers,
>
> Richard


-- 
Kai Kang
Wind River Linux