From ca3d034b3909dfe7ae5d2044f3547e57cb9fb8f5 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 11 Apr 2014 13:05:45 -0700 Subject: [PATCH] Makefile.am: Fix build hang when .git and Git are present but don't work. If the .git directory is there, and "git --version" works, but "git ls-files" fails to print any file names (e.g. perhaps because .git is a symlink to an inaccessible directory) then the "grep" command in the thread-safety-check rule would hang forever because it had an empty list of files and therefore expected to read from stdin. This fixes the problem by adding the name of an empty file to the command, which is harmless. Signed-off-by: Ben Pfaff Acked-by: Alex Wang --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e9ca26a43..80619fb62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -247,7 +247,7 @@ thread-safety-check: @if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \ grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \ `git ls-files '$(srcdir)' | grep '\.[ch]$$' \ - | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \ + | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \ | $(EGREP) -v ':[ ]*/?\*'; \ then \ echo "See above for list of calls to functions that are"; \ -- 2.47.0