[Mesa-dev] [PATCH] android: intel: genxml: fix genX_xml.h generation rules

[Mauro Rossi]

2017-04-01 17:18 GMT+02:00 Lionel Landwerlin <lionel.g.landwerlin at intel.com>
:

> On 01/04/17 11:50, Mauro Rossi wrote:
>
>> Recent changes in Makefile.sources merged the aubinator files in
>> a unique list of generated files and genxml/genX_xml.h is now needed
>> to avoid the following building error:
>>
>> ninja: error: '.../genxml/genX_xml.h', needed by '.../genxml/genX_xml.h',
>> missing and no known rule to make it
>> build/core/ninja.mk:148: recipe for target 'ninja_wrapper' failed
>>
>> Fixes: 0f83c05 "intel: genxml: compress all gen files into one"
>> ---
>>   src/intel/Android.genxml.mk | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk
>> index 842d0e13a33..4b0746c245b 100644
>> --- a/src/intel/Android.genxml.mk
>> +++ b/src/intel/Android.genxml.mk
>> @@ -96,6 +96,11 @@ $(intermediates)/genxml/gen9_pack.h: PRIVATE_XML :=
>> $(LOCAL_PATH)/genxml/gen9.xm
>>   $(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml
>> $(LOCAL_PATH)/genxml/gen_pack_header.py
>>         $(call header-gen)
>>   +$(intermediates)/genxml/genX_xml.h: $(addprefix
>> $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES))
>> $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py
>> +       @mkdir -p $(dir $@)
>> +       @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
>> +       $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py
>> $(addprefix $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) > $@ || (rm -f
>> $@; false)
>> +
>>
>
> The other files seems to use the header-gen macro, why not this one too?
>

Hi Lionel,

the header-gen macro could have be reused,
but additional '|| (rm -f $@; false)' would have required an hybrid
generation rule
or to define an additional macro.

In this way the exact automake generation rules have been ported and are
less cryptic,
as suggested by Emil in the last serie of similar cases.

Mauro



>
> Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
>
>   LOCAL_EXPORT_C_INCLUDE_DIRS := \
>>         $(MESA_TOP)/src/intel \
>>         $(intermediates)
>>
>
>
>

<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail>
Mail
priva di virus. www.avast.com
<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail>
<#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170401/a7909303/attachment-0001.html>