You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/01/23 18:36:18 UTC
[1/5] mesos git commit: Fixed stout build with newer boost versions.
Repository: mesos
Updated Branches:
refs/heads/master e91ce42ed -> ce0905fcb
Fixed stout build with newer boost versions.
Starting from Boost 1.62, Boost.Variant added additional
compile-time checks to its constructors to fix this
issue: https://svn.boost.org/trac10/ticket/11602
However, this breaks some places in stout which try
to access a derived class from a variant holding the
base class.
Review: https://reviews.apache.org/r/62160/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a892a2e8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a892a2e8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a892a2e8
Branch: refs/heads/master
Commit: a892a2e80255291e6cd5cb3b0e90b9a029989c99
Parents: e91ce42
Author: Benno Evers <be...@mesosphere.com>
Authored: Tue Jan 23 14:47:24 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Jan 23 14:47:24 2018 +0100
----------------------------------------------------------------------
3rdparty/stout/include/stout/json.hpp | 10 ++++------
3rdparty/stout/include/stout/protobuf.hpp | 8 ++++----
3rdparty/stout/tests/json_tests.cpp | 2 --
3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a892a2e8/3rdparty/stout/include/stout/json.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/json.hpp b/3rdparty/stout/include/stout/json.hpp
index 4f9ea1b..7484f4a 100644
--- a/3rdparty/stout/include/stout/json.hpp
+++ b/3rdparty/stout/include/stout/json.hpp
@@ -229,15 +229,13 @@ struct Null {};
namespace internal {
-// Only Object and Array require recursive_wrapper, not sure
-// if there is a reason to wrap the others or not.
// Null needs to be first so that it is the default value.
-typedef boost::variant<boost::recursive_wrapper<Null>,
- boost::recursive_wrapper<String>,
- boost::recursive_wrapper<Number>,
+typedef boost::variant<Null,
+ String,
+ Number,
boost::recursive_wrapper<Object>,
boost::recursive_wrapper<Array>,
- boost::recursive_wrapper<Boolean>> Variant;
+ Boolean> Variant;
} // namespace internal {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a892a2e8/3rdparty/stout/include/stout/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/protobuf.hpp b/3rdparty/stout/include/stout/protobuf.hpp
index 01d7581..7e76598 100644
--- a/3rdparty/stout/include/stout/protobuf.hpp
+++ b/3rdparty/stout/include/stout/protobuf.hpp
@@ -900,9 +900,9 @@ inline Object protobuf(const google::protobuf::Message& message)
break;
case google::protobuf::FieldDescriptor::TYPE_BOOL:
if (reflection->GetRepeatedBool(message, field, i)) {
- array.values.push_back(JSON::True());
+ array.values.push_back(JSON::Boolean(true));
} else {
- array.values.push_back(JSON::False());
+ array.values.push_back(JSON::Boolean(false));
}
break;
case google::protobuf::FieldDescriptor::TYPE_STRING:
@@ -963,9 +963,9 @@ inline Object protobuf(const google::protobuf::Message& message)
break;
case google::protobuf::FieldDescriptor::TYPE_BOOL:
if (reflection->GetBool(message, field)) {
- object.values[field->name()] = JSON::True();
+ object.values[field->name()] = JSON::Boolean(true);
} else {
- object.values[field->name()] = JSON::False();
+ object.values[field->name()] = JSON::Boolean(false);
}
break;
case google::protobuf::FieldDescriptor::TYPE_STRING:
http://git-wip-us.apache.org/repos/asf/mesos/blob/a892a2e8/3rdparty/stout/tests/json_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/json_tests.cpp b/3rdparty/stout/tests/json_tests.cpp
index adaa343..af00e42 100644
--- a/3rdparty/stout/tests/json_tests.cpp
+++ b/3rdparty/stout/tests/json_tests.cpp
@@ -355,8 +355,6 @@ TEST(JsonTest, Find)
EXPECT_NONE(object.find<JSON::Number>("nested1.nested2.null"));
EXPECT_NONE(object.find<JSON::Object>("nested1.nested2.null"));
EXPECT_NONE(object.find<JSON::Array>("nested1.nested2.null"));
- EXPECT_NONE(object.find<JSON::True>("nested1.nested2.null"));
- EXPECT_NONE(object.find<JSON::False>("nested1.nested2.null"));
EXPECT_NONE(object.find<JSON::Boolean>("nested1.nested2.null"));
// Also test getting JSON::Value when you don't know the type.
[2/5] mesos git commit: Added UNREACHABLE() macro to
__cxa_pure_virtual.
Posted by bb...@apache.org.
Added UNREACHABLE() macro to __cxa_pure_virtual.
The function __cxa_pure_virtual must not return,
but newer versions of clang detect that the expansion
of the RAW_LOG() macro contains returning code paths
for arguments other than FATAL.
Review: https://reviews.apache.org/r/62444/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cd2774ef
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cd2774ef
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cd2774ef
Branch: refs/heads/master
Commit: cd2774efde5e55cc027721086af14fbc78688849
Parents: a892a2e
Author: Benno Evers <be...@mesosphere.com>
Authored: Tue Jan 23 14:47:28 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Jan 23 14:47:28 2018 +0100
----------------------------------------------------------------------
src/logging/logging.cpp | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cd2774ef/src/logging/logging.cpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp
index 19dba7f..8e03ac6 100644
--- a/src/logging/logging.cpp
+++ b/src/logging/logging.cpp
@@ -30,6 +30,7 @@
#include <stout/path.hpp>
#include <stout/stringify.hpp>
#include <stout/try.hpp>
+#include <stout/unreachable.hpp>
#ifndef __WINDOWS__
#include <stout/os/signals.hpp>
@@ -66,6 +67,7 @@ using std::string;
extern "C" void __cxa_pure_virtual()
{
RAW_LOG(FATAL, "Pure virtual method called");
+ UNREACHABLE();
}
[4/5] mesos git commit: Removed duplicate block in configure.ac.
Posted by bb...@apache.org.
Removed duplicate block in configure.ac.
This blocks seems to have been copy/pasted from another place.
Review: https://reviews.apache.org/r/62445/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a01b4c27
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a01b4c27
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a01b4c27
Branch: refs/heads/master
Commit: a01b4c272848702d5bd3dd899e610a5459c4e57c
Parents: 469363d
Author: Benno Evers <be...@mesosphere.com>
Authored: Tue Jan 23 14:47:32 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Jan 23 19:31:17 2018 +0100
----------------------------------------------------------------------
configure.ac | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a01b4c27/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5929288..fc34ff4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1661,13 +1661,6 @@ fi
AM_CONDITIONAL([WITH_BUNDLED_PICOJSON], [test "x$with_bundled_picojson" = "xyes"])
-# Check if protobuf prefix path was supplied and if so, add it to
-# CPPFLAGS while extending it by /include and to LDFLAGS while
-# extending it by /lib.
-if test -n "`echo $with_protobuf`"; then
- CPPFLAGS="$CPPFLAGS -isystem ${with_protobuf}/include"
- LDFLAGS="$LDFLAGS -L${with_protobuf}/lib"
-fi
# Check if Sasl2 prefix path was provided, and if so, add it to
# the CPPFLAGS and LDFLAGS with respective /include and /lib path
# suffixes.
[3/5] mesos git commit: Updated boost version.
Posted by bb...@apache.org.
Updated boost version.
Review: https://reviews.apache.org/r/62161/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/469363d4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/469363d4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/469363d4
Branch: refs/heads/master
Commit: 469363d4322c7acda7fd10acbe8822f610af5a43
Parents: cd2774e
Author: Benno Evers <be...@mesosphere.com>
Authored: Tue Jan 23 14:47:31 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Jan 23 19:31:03 2018 +0100
----------------------------------------------------------------------
3rdparty/boost-1.53.0.tar.gz | Bin 1083820 -> 0 bytes
3rdparty/boost-1.65.0.tar.gz | Bin 0 -> 1132518 bytes
3rdparty/cmake/Versions.cmake | 4 ++--
3rdparty/versions.am | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/469363d4/3rdparty/boost-1.53.0.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/boost-1.53.0.tar.gz b/3rdparty/boost-1.53.0.tar.gz
deleted file mode 100644
index 175f373..0000000
Binary files a/3rdparty/boost-1.53.0.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/469363d4/3rdparty/boost-1.65.0.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/boost-1.65.0.tar.gz b/3rdparty/boost-1.65.0.tar.gz
new file mode 100644
index 0000000..25973f3
Binary files /dev/null and b/3rdparty/boost-1.65.0.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/469363d4/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index ce6ecf5..94b0d80 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -1,5 +1,5 @@
-set(BOOST_VERSION "1.53.0")
-set(BOOST_HASH "SHA256=CED7CE2ED8D7D34815AC9DB1D18D28FCD386FFBB3DE6DA45303E1CF193717038")
+set(BOOST_VERSION "1.65.0")
+set(BOOST_HASH "SHA256=085A1696AE2E735AACD0A497d46AACD7EEC0476E0D39937162F642B92F406476")
set(CONCURRENTQUEUE_VERSION "7b69a8f")
set(CONCURRENTQUEUE_HASH "SHA256=B2741A1FB2172C2A829503A85D5EE7548BE7ED04236A3FD1EFD2B6088E065CB7")
set(CURL_VERSION "7.57.0")
http://git-wip-us.apache.org/repos/asf/mesos/blob/469363d4/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index bd35533..3e008d5 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -19,7 +19,7 @@
# third-party packages in exactly one place. For now, however, we
# still need to update version numbers in src/python/setup.py.in too!
-BOOST_VERSION = 1.53.0
+BOOST_VERSION = 1.65.0
CONCURRENTQUEUE_VERSION = 7b69a8f
CSI_VERSION = 0.1.0
ELFIO_VERSION = 3.2
[5/5] mesos git commit: Updated mesos-tidy setup for upgraded Boost
version.
Posted by bb...@apache.org.
Updated mesos-tidy setup for upgraded Boost version.
In a previous commit we updated the bundled Boost version. This patch
updates the mesos-tidy setup to make sure we build the correct bundled
Boost version when creating analysis prerequisites.
Review: https://reviews.apache.org/r/65215/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ce0905fc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ce0905fc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ce0905fc
Branch: refs/heads/master
Commit: ce0905fcb31a10ade0962a89235fa90b01edf01a
Parents: a01b4c2
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Jan 23 14:47:37 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Jan 23 19:31:17 2018 +0100
----------------------------------------------------------------------
support/mesos-tidy/entrypoint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ce0905fc/support/mesos-tidy/entrypoint.sh
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index ef3e2a8..bb6344c 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -35,7 +35,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \
# Build the external dependencies.
# TODO(mpark): Use an external dependencies target once MESOS-6924 is resolved.
-cmake --build 3rdparty --target boost-1.53.0 -- -j $(nproc)
+cmake --build 3rdparty --target boost-1.65.0 -- -j $(nproc)
cmake --build 3rdparty --target elfio-3.2 -- -j $(nproc)
cmake --build 3rdparty --target glog-0.3.3 -- -j $(nproc)
cmake --build 3rdparty --target googletest-1.8.0 -- -j $(nproc)