On Tue, 2018-08-21 at 13:04 +0100, Eric Engestrom wrote:
> This file is regenerated at build time anyway, so this would just get
> overwritten anyway. No reason to ship it in the tarball.
> 
> Fixes: 44df06211cf2c301f6ef "autotools: include git_sha1.h in dist tarball"
> Fixes: 471f708ed6f4787813d0 "git_sha1: simplify logic"
> Cc: Juan A. Suarez Romero <jasua...@igalia.com>
> Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
> ---
> I double-checked; as is, the git hash of the current HEAD would be
> stored in the tarball, and the file would get overwritten with an empty
> hash when mesa is built from the tarball; with this patch, the incorrect
> file is not shipped, and is still generated like normal at build time.

Nice! Thanks for checking this.

Reviewed-by: Juan A. Suarez <jasua...@igalia.com>

> ---
>  src/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 412510f435b19a309532..c4fcd8a92488bf89d6a8 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -26,7 +26,7 @@ git_sha1.h:
>  
>  BUILT_SOURCES = git_sha1.h
>  CLEANFILES = $(BUILT_SOURCES)
> -EXTRA_DIST = git_sha1.h meson.build
> +EXTRA_DIST = meson.build
>  
>  SUBDIRS = . gtest util mapi/glapi/gen mapi
>  

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to