You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/02/02 07:55:26 UTC
[3/9] incubator-kudu git commit: Bump gflags version
Bump gflags version
The previous version ran into into an issue building on OS X 10.11 due to a
mismatch in libtool versions. Bumping gflags to the latest version allows us to
sidestep this by using cmake.
Change-Id: Ifed00bf0396ceb6001f043cd3cd6b12c449cdfd2
Reviewed-on: http://gerrit.cloudera.org:8080/1970
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/7a68e1f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/7a68e1f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/7a68e1f8
Branch: refs/heads/master
Commit: 7a68e1f8baee04eaf259f7567ddc39e09a0f0938
Parents: ee13c00
Author: Dan Burkert <da...@cloudera.com>
Authored: Fri Jan 29 17:44:18 2016 -0800
Committer: Dan Burkert <da...@cloudera.com>
Committed: Sat Jan 30 02:54:36 2016 +0000
----------------------------------------------------------------------
src/kudu/tools/kudu-ksck.cc | 2 +-
thirdparty/build-definitions.sh | 13 ++++++++-----
thirdparty/download-thirdparty.sh | 2 +-
thirdparty/vars.sh | 2 +-
4 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7a68e1f8/src/kudu/tools/kudu-ksck.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-ksck.cc b/src/kudu/tools/kudu-ksck.cc
index 86f4a3a..a663750 100644
--- a/src/kudu/tools/kudu-ksck.cc
+++ b/src/kudu/tools/kudu-ksck.cc
@@ -19,8 +19,8 @@
// on the default RPC port. It verifies that all the reported Tablet Servers are running and that
// the tablets are in a consistent state.
+#include <gflags/gflags.h>
#include <glog/logging.h>
-#include <google/gflags.h>
#include <iostream>
#include "kudu/gutil/strings/split.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7a68e1f8/thirdparty/build-definitions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index ed570f7..dc4d47e 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -115,11 +115,14 @@ build_libstdcxx() {
build_gflags() {
cd $GFLAGS_DIR
- CFLAGS="$EXTRA_CFLAGS" \
- CXXFLAGS="$EXTRA_CXXFLAGS" \
- LDFLAGS="$EXTRA_LDFLAGS" \
- LIBS="$EXTRA_LIBS" \
- ./configure --with-pic --prefix=$PREFIX
+ rm -rf CMakeCache.txt CMakeFiles/
+ CXXFLAGS="$EXTRA_CFLAGS $EXTRA_CXXFLAGS $EXTRA_LDFLAGS $EXTRA_LIBS" \
+ cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_POSITION_INDEPENDENT_CODE=On \
+ -DCMAKE_INSTALL_PREFIX=$PREFIX \
+ -DBUILD_SHARED_LIBS=On \
+ -DBUILD_STATIC_LIBS=On
make -j$PARALLEL install
}
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7a68e1f8/thirdparty/download-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index 2bdd519..f50eb9f 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -80,7 +80,7 @@ if [ ! -d $GMOCK_DIR ]; then
fi
if [ ! -d $GFLAGS_DIR ]; then
- fetch_and_expand gflags-${GFLAGS_VERSION}.zip
+ fetch_and_expand gflags-${GFLAGS_VERSION}.tar.gz
fi
# Check that the gperftools patch has been applied.
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7a68e1f8/thirdparty/vars.sh
----------------------------------------------------------------------
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index baeeec1..9dfcac1 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -29,7 +29,7 @@ PREFIX_DEPS_TSAN=$TP_DIR/installed-deps-tsan
PREFIX_LIBSTDCXX=$PREFIX_DEPS/gcc
PREFIX_LIBSTDCXX_TSAN=$PREFIX_DEPS_TSAN/gcc
-GFLAGS_VERSION=1.5
+GFLAGS_VERSION=2.1.2
GFLAGS_DIR=$TP_DIR/gflags-$GFLAGS_VERSION
GLOG_VERSION=0.3.4