Skip to content

Commit

Permalink
Windows: Added Glog patch for enabling stack trace.
Browse files Browse the repository at this point in the history
This relies on an updated `glog-da816ea70.tar.gz` tarball
in the Mesos 3rdparty repository, which is itself generated from
the `da816ea70` commit on github.com/google/glog.

Additionally, this applies a patch that includes stacktrace support
to glog on Windows.  The code in this patch is included in an upstream
pull request:
google/glog#168

If and when that pull request gets merged, we will update the glog
tarball and remove the need for the extra patch file.

Review: https://reviews.apache.org/r/57490/
  • Loading branch information
andyleejordan authored and kaysoky committed Mar 14, 2017
1 parent fa7f409 commit b4f8929
Show file tree
Hide file tree
Showing 2 changed files with 728 additions and 1 deletion.
3 changes: 2 additions & 1 deletion 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if (WIN32)
# (as well as all the other third-party dependencies) on MSVC 1900.
#
# [1] https://github.com/google/glog/pull/43
set(GLOG_URL ${UPSTREAM_URL}/glog-v0.3.4-g4d391fe.tar.gz)
set(GLOG_URL ${UPSTREAM_URL}/glog-da816ea70.tar.gz)
set(CURL_URL ${UPSTREAM_URL}/curl-${CURL_VERSION}.tar.gz)
set(LIBAPR_URL ${UPSTREAM_URL}/libapr-${LIBAPR_VERSION}.tar.gz)
set(ZLIB_URL ${UPSTREAM_URL}/zlib-${ZLIB_VERSION}.tar.gz)
Expand Down Expand Up @@ -107,6 +107,7 @@ if (NOT WIN32)
set(LIBEVENT_INSTALL_CMD mkdir -p ${LIBEVENT_LIB_ROOT} && cp -r ${LIBEVENT_ROOT}-build/lib/. ${LIBEVENT_LIB_DIR} && cp -r ${LIBEVENT_ROOT}-build/include/. ${LIBEVENT_INCLUDE_DIR} && cp -r ${LIBEVENT_ROOT}/include/. ${LIBEVENT_INCLUDE_DIR})
elseif (WIN32)
set(GLOG_INSTALL_CMD ${CMAKE_NOOP})
set(GLOG_PATCH_CMD ${PATCHEXE_LOCATION} -p1 < ${MESOS_3RDPARTY_SRC}/glog-da816ea70.patch)

set(LIBEVENT_INSTALL_CMD ${CMAKE_NOOP})

Expand Down
Loading

0 comments on commit b4f8929

Please sign in to comment.