From: Emil Velikov <emil.veli...@collabora.com>
It has proven subtle to get it right both form the build side POV (see
commit list below) and builders due to their varying workflows.
Furthermore it does not fully fulfil the reason why it was enforced -
to detect uniqueness between different builds, in order to distinguish
and invalidate Vulkan/GL caches.
With that having a much better solution (previous commit) we can drop
this solution.
This effectively reverts the following commits:
359d9dfec33 ("mesa: automake: add directory prefix for git_sha1.h")
2c424e00c39 ("mesa: automake: ensure that git_sha1.h.tmp has the right
attributes")
b7f7ec78435 ("mesa: automake: distclean git_sha1.h when building OOT")
8229fe68b5d ("automake: get in-tree `make distclean' working again.")
Cc: Timo Aaltonen <tjaal...@debian.org>
Cc: Haixia Shi <h...@chromium.org>
Cc: Jason Ekstrand <ja...@jlekstrand.net>
Cc: mesa-sta...@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
Timo, with this in place you should be able to drop the following
incomplete hunk
https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git/commit/debian?h=debian-experimental&id=5daf16c05dfd9d5eed4b1084119619a066a5f5f6
---
src/Makefile.am | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 32372da..b130f5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,15 +25,13 @@ git_sha1.h.tmp:
@# a gitlink file if $(top_srcdir) is a submodule checkout or a linked
@# worktree.
@# If we are building from a release tarball copy the bundled header.
+ @touch git_sha1.h.tmp
@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"/' \
> git_sha1.h.tmp ; \
fi \
- else \
- cp $(srcdir)/git_sha1.h git_sha1.h.tmp ;\
- chmod u+w git_sha1.h.tmp; \
fi
git_sha1.h: git_sha1.h.tmp
@@ -45,12 +43,7 @@ git_sha1.h: git_sha1.h.tmp
fi
BUILT_SOURCES = git_sha1.h
-
-# We want to keep the srcdir file since we need it on rebuild from tarball.
-# At the same time `make distclean' gets angry at us if we don't cleanup the
-# builddir one.
-distclean-local:
- ( test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h )
|| true
+CLEANFILES = $(BUILT_SOURCES)
SUBDIRS = . gtest util mapi/glapi/gen mapi
@@ -100,7 +93,7 @@ SUBDIRS += gallium
endif
EXTRA_DIST = \
- getopt hgl SConscript git_sha1.h
+ getopt hgl SConscript
AM_CFLAGS = $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
--
2.8.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
