You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/05/26 17:11:08 UTC
[2/9] mesos git commit: Remove unnecessary patch after protobuf
upgrade to 3.3.0.
Remove unnecessary patch after protobuf upgrade to 3.3.0.
The patch should already be included in protobuf 3.0.0+, so
this is not necessary anymore.
Review: https://reviews.apache.org/r/58513/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f680ff2c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f680ff2c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f680ff2c
Branch: refs/heads/master
Commit: f680ff2c7c2e2a20965c7fab9f1a5aa784f57bf0
Parents: 114599e
Author: Zhitao Li <zh...@gmail.com>
Authored: Fri May 26 09:39:25 2017 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Fri May 26 09:39:25 2017 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 2 --
3rdparty/Makefile.am | 5 -----
3rdparty/protobuf-2.6.1.patch | 22 ----------------------
3 files changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f680ff2c/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index d8658f6..815bea3 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -310,7 +310,6 @@ elseif (WIN32)
endif (NOT WIN32)
if (NOT WIN32)
- PATCH_CMD(${MESOS_3RDPARTY_SRC}/protobuf-${PROTOBUF_VERSION}.patch PROTOBUF_PATCH_CMD)
set(PROTOBUF_CONFIG_CMD ${PROTOBUF_ROOT}/src/../configure --prefix=${PROTOBUF_LIB_ROOT})
set(PROTOBUF_BUILD_CMD make)
set(PROTOBUF_INSTALL_CMD make install)
@@ -341,7 +340,6 @@ ExternalProject_Add(
${PROTOBUF_TARGET}
PREFIX ${PROTOBUF_CMAKE_ROOT}
CMAKE_ARGS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_CXX_FLAGS_DEBUG="/MTd"
- PATCH_COMMAND ${PROTOBUF_PATCH_CMD}
CONFIGURE_COMMAND ${PROTOBUF_CONFIG_CMD}
BUILD_COMMAND ${PROTOBUF_BUILD_CMD}
INSTALL_COMMAND ${PROTOBUF_INSTALL_CMD}
http://git-wip-us.apache.org/repos/asf/mesos/blob/f680ff2c/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 31eb971..d5cc84c 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -95,11 +95,6 @@ EXTRA_DIST += \
EXTRA_DIST += \
$(LIBEV).patch
-# We include an upstream patch for protobuf in order to avoid
-# signed/unsigned comparisons.
-EXTRA_DIST += \
- $(PROTOBUF).patch
-
# We need to patch ZooKeeper in order to get 3.4.8 to compile on PPC LE.
EXTRA_DIST += \
$(ZOOKEEPER).patch
http://git-wip-us.apache.org/repos/asf/mesos/blob/f680ff2c/3rdparty/protobuf-2.6.1.patch
----------------------------------------------------------------------
diff --git a/3rdparty/protobuf-2.6.1.patch b/3rdparty/protobuf-2.6.1.patch
deleted file mode 100644
index bfd3bb2..0000000
--- a/3rdparty/protobuf-2.6.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 717f80749996ba97d050dd980a8e2ed97873d49e Mon Sep 17 00:00:00 2001
-From: abyss7 <ab...@gmail.com>
-Date: Mon, 3 Nov 2014 10:20:08 +0300
-Subject: [PATCH] Silence -Wsign-compare warning on Mac
-
----
- src/google/protobuf/wire_format_lite_inl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/google/protobuf/wire_format_lite_inl.h b/src/google/protobuf/wire_format_lite_inl.h
-index 4e8ac9b..feb2254 100644
---- a/src/google/protobuf/wire_format_lite_inl.h
-+++ b/src/google/protobuf/wire_format_lite_inl.h
-@@ -380,7 +380,7 @@ inline bool WireFormatLite::ReadPackedFixedSizePrimitive(
- #else
- values->Reserve(old_entries + new_entries);
- CType value;
-- for (int i = 0; i < new_entries; ++i) {
-+ for (uint32 i = 0; i < new_entries; ++i) {
- if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
- values->AddAlreadyReserved(value);
- }