Module: Mesa
Branch: master
Commit: 75784243df1f5bb0652fb243b37d69f36d493a86
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=75784243df1f5bb0652fb243b37d69f36d493a86
Author: Chad Versace <chad.vers...@intel.com>
Date: Thu Jul 9 18:46:21 2015 -0700
mesa: Fix generation of git_sha1.h.tmp for gitlinks
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-sta...@lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <ito...@igalia.com>
---
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"/' \
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
