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/02/13 22:59:58 UTC
git commit: Patched glog to build for clang on Linux.
Updated Branches:
refs/heads/master d949ac3d7 -> 31a938441
Patched glog to build for clang on Linux.
The patch is taken from:
https://code.google.com/p/google-glog/issues/detail?id=129
Review: https://reviews.apache.org/r/18096
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/31a93844
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/31a93844
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/31a93844
Branch: refs/heads/master
Commit: 31a9384410eb86b044e5eb5ccae11e1097809bc7
Parents: d949ac3
Author: Vinod Kone <vi...@twitter.com>
Authored: Thu Feb 13 12:36:06 2014 -0800
Committer: Vinod Kone <vi...@twitter.com>
Committed: Thu Feb 13 13:58:55 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 2 +-
3rdparty/libprocess/3rdparty/glog-0.3.3.patch | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/31a93844/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 168ecea..51b118c 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = \
$(RY_HTTP_PARSER).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.
+# compiling with clang (and C++11); see MESOS-860, MESOS-966.
EXTRA_DIST += \
$(GLOG).patch
http://git-wip-us.apache.org/repos/asf/mesos/blob/31a93844/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/glog-0.3.3.patch b/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
index 2217103..974f9f5 100644
--- a/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
+++ b/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
@@ -1,3 +1,16 @@
+diff --git a/src/symbolize.cc b/src/symbolize.cc
+index 30836de..3e90573 100644
+--- a/src/symbolize.cc
++++ b/src/symbolize.cc
+@@ -232,7 +232,7 @@
+ }
+ char header_name[kMaxSectionNameLen];
+ if (sizeof(header_name) < name_len) {
+- RAW_LOG(WARNING, "Section name '%s' is too long (%"PRIuS"); "
++ RAW_LOG(WARNING, "Section name '%s' is too long (%" PRIuS "); "
+ "section will not be found (even if present).", name, name_len);
+ // No point in even trying.
+ return false;
diff --git a/src/glog/stl_logging.h.in b/src/glog/stl_logging.h.in
index 30836de..3e90573 100644
--- a/src/glog/stl_logging.h.in