[OE-core] [rocko][PATCH] glibc: Avoid multilibbing on wordsize.h

[akuster808]

On 08/09/2018 10:10 AM, Daniel Díaz wrote:
> Hello!
>
>
> On 26 July 2018 at 09:38, Daniel Díaz <daniel.diaz at linaro.org> wrote:
>> Once another header #includes <bits/wordsize.h>, there is a
>> potential recursion going on because the
>> multilib_header_wrapper.h #includes <bits/wordsize.h> again!
>>
>> This should not happen because an __arm__ (32-bits) or an
>> __aarch64__ (64-bits) environment guarantees that we will
>> be getting the correct definition, but when building against
>> a different target (like BPF), recursion is what happens.
>>
>> This can be seen, for instance, when building eBPF programs
>> from the kernel with `clang -target bpf', such as the ones
>> located in linux/tools/testing/selftests/bpf/.
>>
>> (From OE-Core rev: a74c77d6168101e88c3a3bce7130f4f52cfab95d)
>>
>> Signed-off-by: Daniel Díaz <daniel.diaz at linaro.org>
>> Signed-off-by: Aníbal Limón <anibal.limon at linaro.org>
>> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
>> ---
>>  meta/recipes-core/glibc/glibc-package.inc | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
>> index b6d8074..c360dd9 100644
>> --- a/meta/recipes-core/glibc/glibc-package.inc
>> +++ b/meta/recipes-core/glibc/glibc-package.inc
>> @@ -136,8 +136,7 @@ do_install_append_armeb () {
>>  }
>>
>>  do_install_armmultilib () {
>> -
>> -       oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h
>> +       oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h
>>         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
>>
>> --
>> 2.7.4
>
> Please disregard this patch. An alternative will be posted shortly.
ok, thanks for the heads up. its in my mut branch. I will dropped shortly.

- armin
>
> Greetings!
>
> Daniel Díaz
> daniel.diaz at linaro.org