Module: Mesa Branch: master Commit: 1cd3b57db87f86ddcb9d71afe51777226c34df79 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1cd3b57db87f86ddcb9d71afe51777226c34df79
Author: Mauro Rossi <[email protected]> Date: Thu Feb 25 21:54:00 2021 +0100 android: driconf: Generate a static table when no xmlconfig Fixes the following building error: FAILED: out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_util_intermediates/xmlconfig.o ... external/mesa/src/util/xmlconfig.c:1030:12: fatal error: 'driconf_static.h' file not found ^~~~~~~~~~~~~~~~~~ 1 error generated. Fixes: a6b0ceb ("driconf: Generate a static table when no xmlconfig") Acked-by: Rob Clark <[email protected]> Tested-by: Marijn Suijten <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9294> --- src/util/Android.mk | 7 +++++++ src/util/Makefile.sources | 1 + 2 files changed, 8 insertions(+) diff --git a/src/util/Android.mk b/src/util/Android.mk index 0c0f7397bc8..829699db669 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -69,6 +69,13 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(subst format/u_format_pack.h,util/format/u_format_pack.h,$(MESA_UTIL_GENERATED_FILES))) LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES) +driconf_static_gen := $(LOCAL_PATH)/driconf_static.py +driconf_static_deps := $(LOCAL_PATH)/00-mesa-defaults.conf + +$(intermediates)/driconf_static.h: $(driconf_static_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(driconf_static_gen) $^ $@ + format_srgb_gen := $(LOCAL_PATH)/format_srgb.py $(intermediates)/format_srgb.c: $(format_srgb_gen) diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 082ae70ead3..98cddf8eaa5 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -145,6 +145,7 @@ MESA_UTIL_FILES := \ MESA_UTIL_GENERATED_FILES = \ + driconf_static.h \ format_srgb.c \ format/u_format_table.c \ format/u_format_pack.h _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
