mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From josep...@apache.org
Subject mesos git commit: Fix the Windows build.
Date Wed, 06 Jul 2016 21:23:54 GMT
Repository: mesos
Updated Branches:
  refs/heads/master 76f2cc1a2 -> 8cbc1aeff


Fix the Windows build.

The `patch` command on Windows has a `--binary` option to deal with
the line ending discrepancy (CRLF vs LF) on Windows.  We missed this
option in one of the Windows patch commands.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8cbc1aef
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8cbc1aef
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8cbc1aef

Branch: refs/heads/master
Commit: 8cbc1aeffbbed1adc0a136740af821a7c6c9f83a
Parents: 76f2cc1
Author: Joseph Wu <josephwu@apache.org>
Authored: Wed Jul 6 14:19:43 2016 -0700
Committer: Joseph Wu <josephwu@apache.org>
Committed: Wed Jul 6 14:19:43 2016 -0700

----------------------------------------------------------------------
 3rdparty/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8cbc1aef/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index a7ae76a..df82599 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -392,7 +392,7 @@ elseif (WIN32)
   # Set the patch command which will utilize patch.exe in temp location for no elevation
prompt
   set(
     ZOOKEEPER_PATCH_CMD
-    ${PATCHEXE_LOCATION} -p1 < ${MESOS_3RDPARTY_SRC}/zookeeper-${ZOOKEEPER_VERSION}.patch)
+    ${PATCHEXE_LOCATION} --binary -p1 < ${MESOS_3RDPARTY_SRC}/zookeeper-${ZOOKEEPER_VERSION}.patch)
 
   VS_BUILD_CMD(
     ZOOKEEPER


Mime
View raw message