On fredag 22. april 2016 19.55.10 CEST Emil Velikov wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> It's used only by dev_icd.json so just call it that way. While we're
> here, manually expand $< (as it might cause issue on some systems)
> and drop the unneeded install_libdir substitution.
>
> Cc: Jason Ekstrand <ja...@jlekstrand.net>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> This commit replaces "anv: remove no longer needed %.json rule"
> ---
> src/intel/vulkan/Makefile.am | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> index 916f171..6d93906 100644
> --- a/src/intel/vulkan/Makefile.am
> +++ b/src/intel/vulkan/Makefile.am
> @@ -190,11 +190,10 @@ icdconf_DATA = intel_icd.json
> # The following is used for development purposes, by setting
> VK_ICD_FILENAMES. noinst_DATA = dev_icd.json
>
> -%.json : %.json.in
> +dev_icd.json : dev_icd.json.in
> $(AM_V_GEN) $(SED) \
> - -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
> - -e "s#@install_libdir@#${libdir}#" < $< > $@
> -
> + -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#"
> + < $(srcdir)/dev_icd.json.in > $@
>
> # Libvulkan with dummy gem. Used for unit tests.
Hello.
This patch breaks the build for me, as it hangs on the sed line. I've sent a
small patch that fixes the issue.
--
Knut
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
