You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2018/07/25 00:17:41 UTC
mesos git commit: Fixed some non-alphabetical ordering in stout build
files.
Repository: mesos
Updated Branches:
refs/heads/master 0776a1dc6 -> 35be8db88
Fixed some non-alphabetical ordering in stout build files.
These changes were requested as part of a separate change, see:
https://reviews.apache.org/r/67985/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/35be8db8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/35be8db8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/35be8db8
Branch: refs/heads/master
Commit: 35be8db88349ba8af4704bb68edcc20b2ce946ab
Parents: 0776a1d
Author: Benjamin Mahler <bm...@apache.org>
Authored: Tue Jul 24 17:16:41 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Jul 24 17:16:44 2018 -0700
----------------------------------------------------------------------
3rdparty/stout/3rdparty/Makefile.am | 6 +++---
3rdparty/stout/CMakeLists.txt | 4 ++--
3rdparty/stout/Makefile.am | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/35be8db8/3rdparty/stout/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/3rdparty/Makefile.am b/3rdparty/stout/3rdparty/Makefile.am
index cc831a9..53e389b 100644
--- a/3rdparty/stout/3rdparty/Makefile.am
+++ b/3rdparty/stout/3rdparty/Makefile.am
@@ -34,15 +34,15 @@ GLOG = glog-$(GLOG_VERSION)
GOOGLETEST = googletest-release-$(GOOGLETEST_VERSION)
GMOCK = $(GOOGLETEST)/googlemock
GTEST = $(GOOGLETEST)/googletest
-PROTOBUF = protobuf-$(PROTOBUF_VERSION)
PICOJSON = picojson-$(PICOJSON_VERSION)
+PROTOBUF = protobuf-$(PROTOBUF_VERSION)
EXTRA_DIST = \
$(BOOST).tar.gz \
$(GLOG).tar.gz \
$(GOOGLETEST).tar.gz \
- $(PROTOBUF).tar.gz \
- $(PICOJSON).tar.gz
+ $(PICOJSON).tar.gz \
+ $(PROTOBUF).tar.gz
# We need to patch glog in order to deal with a compilation issue when
# compiling with clang (and C++11); see MESOS-860, MESOS-966.
http://git-wip-us.apache.org/repos/asf/mesos/blob/35be8db8/3rdparty/stout/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/stout/CMakeLists.txt b/3rdparty/stout/CMakeLists.txt
index 9cbb6f2..371da47 100644
--- a/3rdparty/stout/CMakeLists.txt
+++ b/3rdparty/stout/CMakeLists.txt
@@ -23,13 +23,13 @@ target_link_libraries(
stout INTERFACE
apr
boost
- libcurl
elfio
glog
+ libarchive
+ libcurl
picojson
protobuf
Threads::Threads
- libarchive
zlib
$<$<PLATFORM_ID:Linux>:rt dl svn>
$<$<PLATFORM_ID:Darwin>:svn>
http://git-wip-us.apache.org/repos/asf/mesos/blob/35be8db8/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index 44710c2..ba032c1 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -50,12 +50,12 @@ include ../versions.am
BOOST = $(BUNDLED_DIR)/boost-$(BOOST_VERSION)
ELFIO = $(BUNDLED_DIR)/elfio-$(ELFIO_VERSION)
GLOG = $(BUNDLED_DIR)/glog-$(GLOG_VERSION)
-GOOGLETEST = $(BUNDLED_DIR)/googletest-release-$(GOOGLETEST_VERSION)
GMOCK = $(GOOGLETEST)/googlemock
+GOOGLETEST = $(BUNDLED_DIR)/googletest-release-$(GOOGLETEST_VERSION)
GTEST = $(GOOGLETEST)/googletest
LIBARCHIVE = $(BUNDLED_DIR)/libarchive-$(LIBARCHIVE_VERSION)
-PROTOBUF = $(BUNDLED_DIR)/protobuf-$(PROTOBUF_VERSION)
PICOJSON = $(BUNDLED_DIR)/picojson-$(PICOJSON_VERSION)
+PROTOBUF = $(BUNDLED_DIR)/protobuf-$(PROTOBUF_VERSION)
# Dependencies for all-local.
BUNDLED_DEPS = # Initialize BUNDLED_DEPS so we can add to it.