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 2018/03/19 20:20:45 UTC

[7/9] mesos git commit: Windows: Made SASL use default CRT linking.

Windows: Made SASL use default CRT linking.

Review: https://reviews.apache.org/r/66014


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

Branch: refs/heads/master
Commit: 80cb7163bad28b369460190290f5729e130cae13
Parents: 5ddb740
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Fri Mar 9 12:55:25 2018 -0800
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Mon Mar 19 12:34:57 2018 -0700

----------------------------------------------------------------------
 3rdparty/cyrus-sasl-2.1.27rc3.patch | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/80cb7163/3rdparty/cyrus-sasl-2.1.27rc3.patch
----------------------------------------------------------------------
diff --git a/3rdparty/cyrus-sasl-2.1.27rc3.patch b/3rdparty/cyrus-sasl-2.1.27rc3.patch
index e363b9e..fc273f3 100644
--- a/3rdparty/cyrus-sasl-2.1.27rc3.patch
+++ b/3rdparty/cyrus-sasl-2.1.27rc3.patch
@@ -3,16 +3,10 @@ new file mode 100644
 index 0000000..ae81f5c
 --- /dev/null
 +++ b/CMakeLists.txt
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,34 @@
 +cmake_minimum_required (VERSION 3.8)
 +project (libsasl2)
 +
-+string(APPEND CMAKE_C_FLAGS_RELEASE " /MT")
-+string(APPEND CMAKE_C_FLAGS_DEBUG   " /MTd")
-+
-+string(APPEND CMAKE_CXX_FLAGS_RELEASE " /MT")
-+string(APPEND CMAKE_CXX_FLAGS_DEBUG   " /MTd")
-+
 +file(COPY
 +  include/hmac-md5.h
 +  include/md5.h