[kudu] branch branch-1.10.x updated: thirdparty: fix build-if-necessary in tarballs

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

granthenke pushed a commit to branch branch-1.10.x
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/branch-1.10.x by this push:
     new 428d175  thirdparty: fix build-if-necessary in tarballs
428d175 is described below

commit 428d175bd954f50aed7a5c23e818630a3b557742
Author: Todd Lipcon <to...@apache.org>
AuthorDate: Fri Jun 21 12:14:39 2019 -0700

    thirdparty: fix build-if-necessary in tarballs
    
    build-if-necessary, when run from a tarball, uses a build stamp file for
    each build configuration to know whether it needs to re-run. However,
    a normal build will build both 'common' and then 'tsan' configurations,
    in that order. When we go back to check whether 'common' needs a
    rebuild, we'll see the tsan build-stamp file and think it needs to be
    rebuilt.
    
    This fixes the check to exclude other build-stamp files.
    
    Change-Id: Ifc600d065362e902f4f768080e1f91c90b9f0594
    Reviewed-on: http://gerrit.cloudera.org:8080/13707
    Tested-by: Kudu Jenkins
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
 thirdparty/build-if-necessary.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/thirdparty/build-if-necessary.sh b/thirdparty/build-if-necessary.sh
index 02546fe..c208979 100755
--- a/thirdparty/build-if-necessary.sh
+++ b/thirdparty/build-if-necessary.sh
@@ -85,7 +85,10 @@ else
   for GROUP in $DEPENDENCY_GROUPS; do
     STAMP_FILE=.build-stamp.$GROUP
     if [ -f $STAMP_FILE ]; then
-      CHANGED_FILE_COUNT=$(find . -cnewer $STAMP_FILE | wc -l)
+      CHANGED_FILE_COUNT=$(find . -cnewer $STAMP_FILE |
+        grep -v '^\./\.build-stamp' |
+        grep -v '^\.$' |
+        wc -l)
       echo "$CHANGED_FILE_COUNT file(s) been modified since thirdparty dependency group '$GROUP' was last built."
       if [ $CHANGED_FILE_COUNT -gt 0 ]; then
         echo "Rebuilding."