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/04/05 20:56:14 UTC
[1/4] mesos git commit: Linked libm in ZooKeeper build on FreeBSD.
Repository: mesos
Updated Branches:
refs/heads/master 887dfaf28 -> 6c77580d4
Linked libm in ZooKeeper build on FreeBSD.
Review: https://reviews.apache.org/r/66384/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2a503da1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2a503da1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2a503da1
Branch: refs/heads/master
Commit: 2a503da1acc440ef0abbeb75339247d8842ccc70
Parents: 887dfaf
Author: David Forsythe <df...@gmail.com>
Authored: Thu Apr 5 13:41:20 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Thu Apr 5 13:41:20 2018 -0700
----------------------------------------------------------------------
3rdparty/zookeeper-3.4.8.patch | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2a503da1/3rdparty/zookeeper-3.4.8.patch
----------------------------------------------------------------------
diff --git a/3rdparty/zookeeper-3.4.8.patch b/3rdparty/zookeeper-3.4.8.patch
index 2eaa056..edfc3b5 100644
--- a/3rdparty/zookeeper-3.4.8.patch
+++ b/3rdparty/zookeeper-3.4.8.patch
@@ -1,6 +1,6 @@
diff --git c/src/c/CMakeLists.txt w/src/c/CMakeLists.txt
new file mode 100644
-index 000000000..0f256b59c
+index 000000000..57677caef
--- /dev/null
+++ w/src/c/CMakeLists.txt
@@ -0,0 +1,232 @@
@@ -151,7 +151,7 @@ index 000000000..0f256b59c
+# hashtable library
+set(hashtable_sources src/hashtable/hashtable_itr.c src/hashtable/hashtable.c)
+add_library(hashtable STATIC ${hashtable_sources})
-+target_link_libraries(hashtable PUBLIC $<$<PLATFORM_ID:Linux>:m>)
++target_link_libraries(hashtable PUBLIC $<$<OR:$<PLATFORM_ID:Linux>,$<PLATFORM_ID:FreeBSD>>:m>)
+
+# zookeeper library
+set(zookeeper_sources
@@ -867,10 +867,9 @@ index 06c377e93..c273a932a 100644
-#ifndef EINPROGRESS
-#define EINPROGRESS WSAEINPROGRESS
-#endif
--
--typedef int pid_t;
+#define ACL ZKACL /* Conflict with windows API */
-+
+
+-typedef int pid_t;
#endif
diff --git c/src/c/include/winstdint.h w/src/c/include/winstdint.h
deleted file mode 100644
[3/4] mesos git commit: Linked subversion in stout build on FreeBSD.
Posted by an...@apache.org.
Linked subversion in stout build on FreeBSD.
Review: https://reviews.apache.org/r/66387/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/279e487f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/279e487f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/279e487f
Branch: refs/heads/master
Commit: 279e487f10438b394ebb3cb3e31d50123e52caee
Parents: ab65ffb
Author: David Forsythe <df...@gmail.com>
Authored: Thu Apr 5 13:41:37 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Thu Apr 5 13:41:37 2018 -0700
----------------------------------------------------------------------
3rdparty/stout/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/279e487f/3rdparty/stout/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/stout/CMakeLists.txt b/3rdparty/stout/CMakeLists.txt
index 5d787d8..24a1f0a 100644
--- a/3rdparty/stout/CMakeLists.txt
+++ b/3rdparty/stout/CMakeLists.txt
@@ -32,6 +32,7 @@ target_link_libraries(
zlib
$<$<PLATFORM_ID:Linux>:rt dl svn>
$<$<PLATFORM_ID:Darwin>:svn>
- $<$<PLATFORM_ID:Windows>:Ws2_32 IPHlpAPI Mswsock Secur32 Userenv>)
+ $<$<PLATFORM_ID:Windows>:Ws2_32 IPHlpAPI Mswsock Secur32 Userenv>
+ $<$<PLATFORM_ID:FreeBSD>:svn>)
add_subdirectory(tests)
[2/4] mesos git commit: Linked execinfo in Glog build on FreeBSD.
Posted by an...@apache.org.
Linked execinfo in Glog build on FreeBSD.
Review: https://reviews.apache.org/r/66385/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ab65ffbc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ab65ffbc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ab65ffbc
Branch: refs/heads/master
Commit: ab65ffbcd5d0055688251cb12ff6efd1c21d9e22
Parents: 2a503da
Author: David Forsythe <df...@gmail.com>
Authored: Thu Apr 5 13:41:32 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Thu Apr 5 13:41:32 2018 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 3 +++
cmake/CompilationConfigure.cmake | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ab65ffbc/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 9d0fd55..3854a16 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -370,6 +370,9 @@ if (WIN32)
else ()
# TODO(andschwa): Build with CMake instead when glog is updated.
set(GLOG_CONFIG_CMD ${GLOG_ROOT}/src/../configure --with-pic GTEST_CONFIG=no --prefix=${GLOG_ROOT}-build)
+ if (FREEBSD)
+ list(APPEND GLOG_CONFIG_CMD LDFLAGS=-lexecinfo)
+ endif ()
set(GLOG_BUILD_CMD ${MAKE_PROGRAM})
set(GLOG_INSTALL_CMD ${MAKE_PROGRAM} install)
http://git-wip-us.apache.org/repos/asf/mesos/blob/ab65ffbc/cmake/CompilationConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/CompilationConfigure.cmake b/cmake/CompilationConfigure.cmake
index 64cc56e..3cb072d 100644
--- a/cmake/CompilationConfigure.cmake
+++ b/cmake/CompilationConfigure.cmake
@@ -301,6 +301,9 @@ endif()
######################
string(COMPARE EQUAL ${CMAKE_SYSTEM_NAME} "Linux" LINUX)
+# FREEBSD CONFIGURATION.
+######################
+string(COMPARE EQUAL ${CMAKE_SYSTEM_NAME} "FreeBSD" FREEBSD)
# WINDOWS CONFIGURATION.
########################
[4/4] mesos git commit: Imported sasl2 target on non-Windows
platforms.
Posted by an...@apache.org.
Imported sasl2 target on non-Windows platforms.
Review: https://reviews.apache.org/r/66392/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6c77580d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6c77580d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6c77580d
Branch: refs/heads/master
Commit: 6c77580d49d9465a05d4a1e1714d88d0c70673e5
Parents: 279e487
Author: David Forsythe <df...@gmail.com>
Authored: Thu Apr 5 13:41:43 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Thu Apr 5 13:41:43 2018 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6c77580d/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 3854a16..488e906 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -277,6 +277,9 @@ else ()
if (NOT SASL2_LIB)
message(FATAL_ERROR "Could not find sasl2 dependency.")
endif ()
+
+ add_library(sasl2 SHARED IMPORTED GLOBAL)
+ set_property(TARGET sasl2 PROPERTY IMPORTED_LOCATION ${SASL2_LIB})
endif ()