[OE-core] [PATCH] gnu-efi: copy header files for x32 build

[Khem Raj]

On 4/10/17 4:09 PM, Richard Purdie wrote:
> On Mon, 2017-04-10 at 15:31 -0700, Saul Wold wrote:
>> On Mon, 2017-04-10 at 12:57 -0700, Khem Raj wrote:
>>>
>>>
>>> On 4/10/17 8:58 AM, Saul Wold wrote:
>>>>
>>>>
>>>> Gnu-efi needs to be build for 64bit since it is a boot time tool.
>>>> It
>>>> needs these 2 headers to be in 64 bit versions, we can use the
>>>> existing
>>>> 32bit ones as there is not really any difference.
>>>>
>>>> [YOCTO #11051]
>>>>
>>>> Signed-off-by: Saul Wold <sgw at linux.intel.com>
>>>> ---
>>>>  meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++
>>>>  1 file changed, 5 insertions(+)
>>>>
>>>> diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> index f46381d..6f235b7 100644
>>>> --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
>>>> @@ -24,6 +24,11 @@ SRC_URI[sha256sum] =
>>>> "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef
>>>>  COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
>>>>  COMPATIBLE_HOST_armv4 = 'null'
>>>>  
>>>> +do_configure_linux-gnux32_prepend() {
>>>> +	cp ${STAGING_INCDIR}/gnu/stubs-x32.h
>>>> ${STAGING_INCDIR}/gnu/stubs-64.h
>>>> +	cp ${STAGING_INCDIR}/bits/long-double-32.h
>>>> ${STAGING_INCDIR}/bits/long-double-64.h
>>>> +}
>>>> +
>>> making long-double-32.h pretend long-double-64.h seems wrong to me.
>>> but
>>> if you were to do that then symlinking might be better
>>>
>> I guess I could symlink it, as it turns out with glibc it's an empty
>> header file other than boilerplate, I did not check musl, which I
>> guess
>> I will do now!
>>
>> Even the stubs file is pretty much the same file.
> 
> FWIW, the copy makes the task re-executable. If you make symlinks, the
> code gets a bit more ugly so the task can be re-executed.
> 

ln -sf ?

> Cheers,
> 
> Richard
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: OpenPGP digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170410/9a0aafa2/attachment-0002.sig>