Makefile.am: Fix build hang when .git and Git are present but don't work.
authorBen Pfaff <blp@nicira.com>
Fri, 11 Apr 2014 20:05:45 +0000 (13:05 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 11 Apr 2014 20:08:17 +0000 (13:08 -0700)
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 <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
Makefile.am

index e9ca26a..80619fb 100644 (file)
@@ -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"; \