[Mesa-stable] [Mesa-dev] [PATCH] mesa: Fix generation of git_sha1.h.tmp for gitlinks

[Iago Toral]

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

On Thu, 2015-07-09 at 18:59 -0700, Chad Versace wrote:
> Don't assume that $(top_srcdir)/.git is a directory. It may be a
> gitlink file [1] if $(top_srcdir) is a submodule checkout or a linked
> worktree [2].
> 
> [1] A "gitlink" is a text file that specifies the real location of
>     the gitdir.
> [2] Linked worktrees are a new feature in Git 2.5.
> 
> Cc: "10.6, 10.5" <mesa-stable at lists.freedesktop.org>
> ---
>  src/mesa/Makefile.am | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
> index c86ded9..eb4a3da 100644
> --- a/src/mesa/Makefile.am
> +++ b/src/mesa/Makefile.am
> @@ -38,8 +38,11 @@ gl_HEADERS = $(top_srcdir)/include/GL/*.h
>  
>  .PHONY: main/git_sha1.h.tmp
>  main/git_sha1.h.tmp:
> +	@# Don't assume that $(top_srcdir)/.git is a directory. It may be
> +	@# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
> +	@# worktree.
>  	@touch main/git_sha1.h.tmp
> -	@if test -d $(top_srcdir)/.git; then \
> +	@if test -e $(top_srcdir)/.git; then \
>  		if which git > /dev/null; then \
>  		    git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \
>  			sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \