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 2016/04/22 22:47:29 UTC
mesos git commit: Added upstream patch fixing signed/unsigned
comparison for protobuf.
Repository: mesos
Updated Branches:
refs/heads/master 31496dd51 -> a868b03c9
Added upstream patch fixing signed/unsigned comparison for protobuf.
This adds the upstream patch \`717f807\` which is contained in
\`protobuf-3.0.0-alpha-1\`. Without this patch compilation with gcc6
fails.
Review: https://reviews.apache.org/r/46314/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a868b03c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a868b03c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a868b03c
Branch: refs/heads/master
Commit: a868b03c931d8d53ea18ca3b41b510d2d03efe94
Parents: 31496dd
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Fri Apr 22 13:46:43 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Apr 22 13:46:43 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/CMakeLists.txt | 2 +-
3rdparty/libprocess/3rdparty/Makefile.am | 5 +++++
.../libprocess/3rdparty/protobuf-2.6.1.patch | 22 ++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a868b03c/3rdparty/libprocess/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
index 7b3621d..3b0c7ed 100644
--- a/3rdparty/libprocess/3rdparty/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt
@@ -259,7 +259,7 @@ elseif (WIN32)
endif (NOT WIN32)
if (NOT WIN32)
- set(PROTOBUF_PATCH_CMD ${CMAKE_NOOP})
+ PATCH_CMD(${PROCESS_3RD_SRC}/protobuf-2.6.1.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)
http://git-wip-us.apache.org/repos/asf/mesos/blob/a868b03c/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 895663b..83bd38a 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -62,6 +62,11 @@ EXTRA_DIST += \
EXTRA_DIST += \
$(HTTP_PARSER).patch
+# We include an upstream patch for protobuf in order to avoid
+# signed/unsigned comparisons.
+EXTRA_DIST += \
+ $(PROTOBUF).patch
+
CLEAN_EXTRACTED = \
$(BOOST) \
$(GLOG) \
http://git-wip-us.apache.org/repos/asf/mesos/blob/a868b03c/3rdparty/libprocess/3rdparty/protobuf-2.6.1.patch
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/protobuf-2.6.1.patch b/3rdparty/libprocess/3rdparty/protobuf-2.6.1.patch
new file mode 100644
index 0000000..bfd3bb2
--- /dev/null
+++ b/3rdparty/libprocess/3rdparty/protobuf-2.6.1.patch
@@ -0,0 +1,22 @@
+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);
+ }