Hi, I tried to add LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H) incrementally three places:
src/gallium/drivers/radeonsi/Android.mk src/gallium/targets/dri/Android.mk and src/gallium/auxiliary/Android.mk but it didn't work as expected I also tried by putting later the export in src/util/Android.mk after local generation rules for $(MESA_DRI_OPTIONS_H). but it has no effect. BTW the include is present in automake rules [1] as part of GALLIUM_TARGET_CFLAGS [2] which includes -I$(top_builddir)/src/util/ so the patch is at least in conformance with automake rules for gallium_dri target. If you see better ways please send me istructions Mauro [1] https://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/targets/dri/Makefile.am [2] https://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/Automake.inc 2017-12-19 23:38 GMT+01:00 Rob Herring <r...@kernel.org>: > On Mon, Dec 18, 2017 at 8:45 PM, Yu, Qiang <qiang...@amd.com> wrote: > > I met this problem when upgrade mesa 17.2 to 17.3, and build without > > a make clean. A clean build won't have this problem. > > I think I'm seeing a similar problem on CI builds with current master, > but with intel_screen.c: > > external/mesa3d/src/mesa/drivers/dri/i965/intel_screen.c:60:7: error: > expected '}' > DRI_CONF_MESA_NO_ERROR("false") > ^ > > For the CI jobs, it is dependent on which build machine the job runs on. > > > In the past, we've had some cross module dependency problems with > generated files which were fixed with: > > LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H) > > I think this is needed because we need a dependency on the source > file, not just the include directory. libmesa_pipe_radeonsi is missing > this. However, with the problem I'm hitting, this dependency is there. > > Rob >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
