kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danburk...@apache.org
Subject kudu git commit: Bump protobuf to 3.4.1
Date Mon, 18 Sep 2017 21:25:21 GMT
Repository: kudu
Updated Branches:
  refs/heads/master e171466e8 -> 57de48d20


Bump protobuf to 3.4.1

This allows us to drop the 'experimental' flag for move constructors
introduced in 1632d16aa5993, since they are enabled by default now.

Change-Id: Ieb1683289c016b1e71163501e09b6387212ee7f2
Reviewed-on: http://gerrit.cloudera.org:8080/8086
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <adar@cloudera.com>


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

Branch: refs/heads/master
Commit: 57de48d2007a3ca5be40e5c3f268223abe8dc64e
Parents: e171466
Author: Dan Burkert <danburkert@apache.org>
Authored: Fri Sep 15 16:24:15 2017 -0700
Committer: Dan Burkert <danburkert@apache.org>
Committed: Mon Sep 18 21:24:49 2017 +0000

----------------------------------------------------------------------
 java/gradle/dependencies.gradle   | 4 ++--
 java/pom.xml                      | 2 +-
 thirdparty/build-definitions.sh   | 8 +-------
 thirdparty/download-thirdparty.sh | 4 ----
 thirdparty/vars.sh                | 2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/57de48d2/java/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 153846c..3487c99 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -45,7 +45,7 @@ versions += [
     netty          : "3.10.6.Final",
     parquet        : "1.9.0",
     pmd            : "5.8.1",
-    protobuf       : "3.3.0",
+    protobuf       : "3.4.0",
     scala          : "2.11.11",
     scalatest      : "3.0.3",
     slf4j          : "1.7.25",
@@ -94,4 +94,4 @@ libs += [
     sparkCore         : "org.apache.spark:spark-core_$versions.scalaBase:$versions.spark",
     sparkSql          : "org.apache.spark:spark-sql_$versions.scalaBase:$versions.spark",
     yetusAnnotations  : "org.apache.yetus:audience-annotations:$versions.yetus"
-]
\ No newline at end of file
+]

http://git-wip-us.apache.org/repos/asf/kudu/blob/57de48d2/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index c01f97a..b789b42 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -82,7 +82,7 @@
         <murmur.version>1.0.0</murmur.version>
         <netty.version>3.10.6.Final</netty.version>
         <parquet.version>1.9.0</parquet.version>
-        <protobuf.version>3.3.0</protobuf.version>
+        <protobuf.version>3.4.0</protobuf.version>
         <slf4j.version>1.7.25</slf4j.version>
         <sparkavro.version>3.2.0</sparkavro.version>
         <yetus.version>0.4.0</yetus.version>

http://git-wip-us.apache.org/repos/asf/kudu/blob/57de48d2/thirdparty/build-definitions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index 9aff1e6..acfdf30 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -355,15 +355,10 @@ build_gmock() {
 
 build_protobuf() {
   PROTOBUF_BDIR=$TP_BUILD_DIR/$PROTOBUF_NAME$MODE_SUFFIX
-  # Do a clean build if the patchlevel changed.
-  if [ "$(cd $PROTOBUF_BDIR && ls patchlevel* ||:)" != \
-       "$(cd $PROTOBUF_SOURCE && ls patchlevel* ||:)" ]; then
-    rm -Rf $PROTOBUF_BDIR
-  fi
   mkdir -p $PROTOBUF_BDIR
   pushd $PROTOBUF_BDIR
   CFLAGS="$EXTRA_CFLAGS" \
-    CXXFLAGS="$EXTRA_CXXFLAGS -DPROTO_EXPERIMENTAL_ENABLE_MOVE" \
+    CXXFLAGS="$EXTRA_CXXFLAGS" \
     LDFLAGS="$EXTRA_LDFLAGS" \
     LIBS="$EXTRA_LIBS" \
     $PROTOBUF_SOURCE/configure \
@@ -373,7 +368,6 @@ build_protobuf() {
     --prefix=$PREFIX
   fixup_libtool
   make -j$PARALLEL $EXTRA_MAKEFLAGS install
-  cp $PROTOBUF_SOURCE/patchlevel* .
   popd
 }
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/57de48d2/thirdparty/download-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index cce9063..e7a27e4 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -139,14 +139,10 @@ if [ ! -d $GPERFTOOLS_SOURCE ]; then
   echo
 fi
 
-# We use a patchlevel=2 here to force a rebuild after changing CXXFLAGS.
-# The build itself isn't smart enough to know that this requires rebuilding.
-PROTOBUF_PATCHLEVEL=2
 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

http://git-wip-us.apache.org/repos/asf/kudu/blob/57de48d2/thirdparty/vars.sh
----------------------------------------------------------------------
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index ce1e0e8..4ff2bc4 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -50,7 +50,7 @@ GPERFTOOLS_VERSION=2.2.1
 GPERFTOOLS_NAME=gperftools-$GPERFTOOLS_VERSION
 GPERFTOOLS_SOURCE=$TP_SOURCE_DIR/$GPERFTOOLS_NAME
 
-PROTOBUF_VERSION=3.3.0
+PROTOBUF_VERSION=3.4.1
 PROTOBUF_NAME=protobuf-$PROTOBUF_VERSION
 PROTOBUF_SOURCE=$TP_SOURCE_DIR/$PROTOBUF_NAME
 


Mime
View raw message