On 05.07.2017 14:16, Emil Velikov wrote:
On 5 July 2017 at 12:58, Nicolai Hähnle <nhaeh...@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 :)
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?
Cheers,
Nicolai
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
