[Mesa-dev] [PATCH 04/16] xmlconfig: move into src/util

[Emil Velikov]

On 5 July 2017 at 13:38, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> On 05.07.2017 14:16, Emil Velikov wrote:
>>
>> On 5 July 2017 at 12:58, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
>>>
>>> Thanks for doing the test. I did get the automated email.
>>>
>>> This stuff is mostly guess work and cargo-culting for me since I don't
>>> actually have an Android build setup. Is there any way for me to test
>>> this
>>> easily?
>>>
>>> How about the fixup at
>>> https://cgit.freedesktop.org/~nh/mesa/commit/?h=driconf?
>>>
>> Simply moving the whole hunk (even w/o replacing the first += with :=)
>> should have done it.
>> Looking at the diff, shows the bits causing the problem, me thinks.
>>
>> I'd say keep the first hunk, and drop the second one?
>>
>> Thanks
>> Emil
>>
>> @@ -1,5 +1,5 @@
>> MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
>> -LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H)
>> +LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
>>
>> #
>> # Generate options.h from gettext translations.
>> @@ -37,7 +37,11 @@
>>         msgfmt -o $@ $<
>>
>> $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
>> -$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON)
>> $^ $(PRIVATE_TEMPLATE_HEADER) \
>> + $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ >
>> $@
>> + $(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
>> +        $(transform-generated-source)
>> +
>> +$(PRIVATE_MO_FILES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^
>> $(PRIVATE_TEMPLATE_HEADER) \
>>                 $(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
>>
>> $(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER)
>> $(PRIVATE_MO_FILES)
>
>
> The diffs are getting out of hand :)
>
Apologies.

> Relative to what is that? Is that relative to the old
> src/mesa/drivers/dri/common/Android.mk? Do you mean applying that diff to
> the old dri/common/Android.mk, and then moving that wholesale to src/util?
>
This is the diff you created with the original patch. AKA code in the
original src/mesa/drivers/dri/common/Android.mk vs the new one in
src/util/Android.mk

AFAICT only a dummy move is needed, although I don't have a way to test atm.

Thanks
Emil