Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A6FC0200D01 for ; Fri, 22 Sep 2017 23:03:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A5B4B1609D0; Fri, 22 Sep 2017 21:03:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EAEFD1609BE for ; Fri, 22 Sep 2017 23:03:41 +0200 (CEST) Received: (qmail 4468 invoked by uid 500); 22 Sep 2017 21:03:41 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 4459 invoked by uid 99); 22 Sep 2017 21:03:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Sep 2017 21:03:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2408F5A6D; Fri, 22 Sep 2017 21:03:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: adar@apache.org To: commits@kudu.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: kudu git commit: thirdparty: fix to protobuf bump Date: Fri, 22 Sep 2017 21:03:40 +0000 (UTC) archived-at: Fri, 22 Sep 2017 21:03:42 -0000 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 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 Authored: Wed Sep 20 18:25:36 2017 -0700 Committer: Adar Dembo 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