[Mesa-dev] [PATCH 1/2] anv: automake: use the local headers over any system provided ones

Grazvydas Ignotas notasas at gmail.com
Mon Mar 20 21:12:00 UTC 2017


On Mon, Mar 20, 2017 at 5:18 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> At the moment, we would honour any system headers - vulkan_intel.h in
> particular over the ones in-tree.
>
> Thus, if one does inclemental build of mesa, without the vulkan.h
> already installed (or at least not in the same directory as
> vulkan_intel.h) the build will fail.
>
> In the future we might want to upstream the vulkan_intel.h within
> vulkan.h, but in either case the more robust thing is to rely on our own
> copy.
>
> Cc: Grazvydas Ignotas <notasas at gmail.com>
> Fixes: ee8044fd "intel/vulkan: Get rid of recursive make"
> Suggested-by: Jason Ekstrand <jason at jlekstrand.net>
> Reported-by: Grazvydas Ignotas <notasas at gmail.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Grazvydas, since I butchered if while trying to explain myself I went
> ahead and addressed the problem. Please double-check on your end.

This works so I'm happy enough, but wouldn't it be better to just swap
$(AM_CPPFLAGS) and $(LIBDRM_CFLAGS) (which also works for me)?
As mentioned, $(AM_CPPFLAGS) contains -I<install_include_path> after
mesa includes, which means installed includes will get priority over
-I$(top_srcdir)/src and friends from VULKAN_CPPFLAGS.

GraÅžvydas


More information about the mesa-dev mailing list