Bump glog to 0.3.5

Change-Id: I9f638970abfd1aa214cf0032b46064ff7edf4dc4 Reviewed-on: http://gerrit.cloudera.org:8080/6871 Tested-by: Kudu Jenkins Reviewed-by: Dan Burkert <[email protected]>
yubobo · May 12, 2017 · 4ec6280 · 4ec6280
1 parent a7e8994
commit 4ec6280
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 97 deletions.
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
@@ -102,15 +102,14 @@ fetch_and_expand() {
 mkdir -p $TP_SOURCE_DIR
 cd $TP_SOURCE_DIR
 
-GLOG_PATCHLEVEL=3
+GLOG_PATCHLEVEL=2
 delete_if_wrong_patchlevel $GLOG_SOURCE $GLOG_PATCHLEVEL
 if [ ! -d $GLOG_SOURCE ]; then
   fetch_and_expand glog-${GLOG_VERSION}.tar.gz
 
   pushd $GLOG_SOURCE
   patch -p0 < $TP_DIR/patches/glog-issue-198-fix-unused-warnings.patch
   patch -p0 < $TP_DIR/patches/glog-issue-54-dont-build-tests.patch
-  patch -p1 < $TP_DIR/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch
   touch patchlevel-$GLOG_PATCHLEVEL
   autoreconf -fvi
   popd

diff --git a/thirdparty/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch b/thirdparty/patches/glog-cda16b3443e2d6ef88cdbbe10b9a11adea6f33fe.patch
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
@@ -38,7 +38,7 @@ GFLAGS_VERSION=2.2.0
 GFLAGS_NAME=gflags-$GFLAGS_VERSION
 GFLAGS_SOURCE=$TP_SOURCE_DIR/$GFLAGS_NAME
 
-GLOG_VERSION=0.3.4
+GLOG_VERSION=0.3.5
 GLOG_NAME=glog-$GLOG_VERSION
 GLOG_SOURCE=$TP_SOURCE_DIR/$GLOG_NAME