You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/03/12 19:24:22 UTC
[1/3] git commit: Only darwin/clang needs GTEST to supply its own tr1
tuple.
Repository: mesos
Updated Branches:
refs/heads/master 4c3217829 -> ffda972f7
Only darwin/clang needs GTEST to supply its own tr1 tuple.
Review: https://reviews.apache.org/r/19077
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0acca8c0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0acca8c0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0acca8c0
Branch: refs/heads/master
Commit: 0acca8c092371a1255fd89430ae228d6e1a84b85
Parents: 4c32178
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Wed Mar 12 10:17:32 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Mar 12 10:17:32 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/configure.ac | 11 +++++------
configure.ac | 10 +++++-----
2 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0acca8c0/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index f4e0bcb..232d713 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -158,15 +158,14 @@ if test "x$with_cxx11" = "xyes"; then
if test "x$CLANG" = "xyes"; then
CXXFLAGS="$CXXFLAGS -stdlib=libc++"
fi
+
+ # GTEST on OSX needs its own tr1 tuple.
+ # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when in
+ # c++11 mode.
+ CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1"
;;
esac
- # Force gtest to use it's own tuple implementation since 'tr1/tuple'
- # might not exist (for example, if building with clang).
- # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when in
- # c++11 mode.
- CXXFLAGS="-DGTEST_USE_OWN_TR1_TUPLE=1 $CXXFLAGS"
-
# Also pass the flags to 3rdparty libraries.
CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'"
fi
http://git-wip-us.apache.org/repos/asf/mesos/blob/0acca8c0/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 390f11b..ea21cd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,14 +621,14 @@ if test "x$with_cxx11" = "xyes"; then
if test "x$CLANG" = "xyes"; then
CXXFLAGS="$CXXFLAGS -stdlib=libc++"
fi
+
+ # GTEST on OSX needs its own tr1 tuple.
+ # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when in
+ # c++11 mode.
+ CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1"
;;
esac
- # Force gtest to use it's own tuple implementation since 'tr1/tuple'
- # might not exist (for example, if building with clang).
- # TODO(dhamon): Upgrade gmock to 1.7 and pass GTEST_LANG_CXX11.
- CXXFLAGS="-DGTEST_USE_OWN_TR1_TUPLE=1 $CXXFLAGS"
-
# Also pass the flags to 3rdparty libraries.
CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'"
fi
[3/3] git commit: Switched to cxx11 by default for mesos.
Posted by vi...@apache.org.
Switched to cxx11 by default for mesos.
Review: https://reviews.apache.org/r/18576
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ffda972f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ffda972f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ffda972f
Branch: refs/heads/master
Commit: ffda972f7bc3c118a24becb3a8edcadfe08a851d
Parents: 5aa7073
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Wed Mar 12 10:18:37 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Mar 12 10:18:37 2014 -0700
----------------------------------------------------------------------
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ffda972f/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ea21cd8..639d4ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,9 +147,9 @@ AC_ARG_WITH([included-zookeeper],
[], [with_included_zookeeper=yes])
AC_ARG_WITH([cxx11],
- AS_HELP_STRING([--with-cxx11],
- [builds Mesos using C++11]),
- [], [with_cxx11=no])
+ AS_HELP_STRING([--without-cxx11],
+ [builds Mesos without C++11 support (deprecated)]),
+ [], [with_cxx11=yes])
# TODO(benh): Support --without-included-protobuf,
# --without-included-glog, etc. Doing this for protobuf is
[2/3] git commit: Switched to cxx11 by default for libprocess.
Posted by vi...@apache.org.
Switched to cxx11 by default for libprocess.
Review: https://reviews.apache.org/r/18577
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5aa7073e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5aa7073e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5aa7073e
Branch: refs/heads/master
Commit: 5aa7073e101cc63be58c26929d98ec83c42d769d
Parents: 0acca8c
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Wed Mar 12 10:18:26 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Mar 12 10:18:26 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5aa7073e/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index 232d713..e814e45 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -70,9 +70,9 @@ AC_ARG_WITH([zlib],
[], [with_zlib=yes])
AC_ARG_WITH([cxx11],
- AS_HELP_STRING([--with-cxx11],
- [builds libprocess using C++11]),
- [], [with_cxx11=no])
+ AS_HELP_STRING([--without-cxx11],
+ [builds libprocess without C++11 support (deprecated)]),
+ [], [with_cxx11=yes])
# Do some OS specific setup.