kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject kudu git commit: thirdparty: fix to protobuf bump
Date Fri, 22 Sep 2017 21:03:40 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 315a464c1 -> 9c5d6d4df


thirdparty: fix to protobuf bump

Commit 57de48d bumped protobuf to 3.4.1 but didn't remove the call to
delete_if_wrong_patchlevel, which meant that every time
download-thirdparty.sh was run, it'd redownload and reextract protobuf.

Rather than remove delete_if_wrong_patchlevel, this patch sets protobuf to
use patchlevel 0. That way, download-thirdparty.sh will rebuild protobuf
when switching between different git branches with differing protobuf
patchlevels. If we had removed the patchlevel altogether, it wouldn't be
smart enough to recognize a change and rebuild when switching back to "now".

Change-Id: I3d1d05b60051a355a177dd2807ac56debaf1b7a0
Reviewed-on: http://gerrit.cloudera.org:8080/8115
Tested-by: Kudu Jenkins
Reviewed-by: David Ribeiro Alves <davidralves@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/9c5d6d4d
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/9c5d6d4d
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/9c5d6d4d

Branch: refs/heads/master
Commit: 9c5d6d4dfdd20c7c00896a2ddce1582971aeffe4
Parents: 315a464
Author: Adar Dembo <adar@cloudera.com>
Authored: Wed Sep 20 18:25:36 2017 -0700
Committer: Adar Dembo <adar@cloudera.com>
Committed: Fri Sep 22 21:03:18 2017 +0000

----------------------------------------------------------------------
 thirdparty/download-thirdparty.sh | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/9c5d6d4d/thirdparty/download-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index 7519485..fc94910 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -139,10 +139,12 @@ if [ ! -d $GPERFTOOLS_SOURCE ]; then
   echo
 fi
 
+PROTOBUF_PATCHLEVEL=0
 delete_if_wrong_patchlevel $PROTOBUF_SOURCE $PROTOBUF_PATCHLEVEL
 if [ ! -d $PROTOBUF_SOURCE ]; then
   fetch_and_expand protobuf-${PROTOBUF_VERSION}.tar.gz
   pushd $PROTOBUF_SOURCE
+  touch patchlevel-$PROTOBUF_PATCHLEVEL
   autoreconf -fvi
   popd
 fi


Mime
View raw message