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 2016/04/01 04:34:16 UTC
[1/2] mesos git commit: Upgrade libev to 4.22 to support PowerPC LE
platform [libprocess].
Repository: mesos
Updated Branches:
refs/heads/master 53e8c0859 -> 66805e25e
Upgrade libev to 4.22 to support PowerPC LE platform [libprocess].
Review: https://reviews.apache.org/r/44378/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3ba946e5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3ba946e5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3ba946e5
Branch: refs/heads/master
Commit: 3ba946e5a1e4912bbe98baf098029c18e86d8707
Parents: 53e8c08
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Thu Mar 31 19:32:46 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Mar 31 19:32:46 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/CMakeLists.txt | 2 +-
3rdparty/libprocess/3rdparty/libev-4.15.patch | 23 --------------------
3rdparty/libprocess/3rdparty/libev-4.15.tar.gz | Bin 513919 -> 0 bytes
3rdparty/libprocess/3rdparty/libev-4.22.patch | 12 ++++++++++
3rdparty/libprocess/3rdparty/libev-4.22.tar.gz | Bin 0 -> 531533 bytes
3rdparty/libprocess/3rdparty/versions.am | 2 +-
6 files changed, 14 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ba946e5/3rdparty/libprocess/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
index c3dcbb5..21fc067 100644
--- a/3rdparty/libprocess/3rdparty/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt
@@ -95,7 +95,7 @@ if (NOT WIN32)
set(LIBEV_BUILD_CMD make)
set(LIBEV_INSTALL_CMD mkdir -p ${LIBEV_LIB_ROOT} && cp -r ${LIBEV_ROOT}-build/.libs/. ${LIBEV_LIB_ROOT})
# Patch libev to keep it from reaping child processes.
- PATCH_CMD(${PROCESS_3RD_SRC}/libev-4.15.patch LIBEV_PATCH_CMD)
+ PATCH_CMD(${PROCESS_3RD_SRC}/libev-4.22.patch LIBEV_PATCH_CMD)
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)
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ba946e5/3rdparty/libprocess/3rdparty/libev-4.15.patch
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/libev-4.15.patch b/3rdparty/libprocess/3rdparty/libev-4.15.patch
deleted file mode 100644
index bbd83e6..0000000
--- a/3rdparty/libprocess/3rdparty/libev-4.15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rupN libev-4.15/ev.h libev-4.15-patched/ev.h
---- libev-4.15/ev.h 2013-03-01 03:05:29.000000000 -0800
-+++ libev-4.15-patched/ev.h 2013-05-20 16:01:47.000000000 -0700
-@@ -121,7 +121,7 @@ EV_CPP(extern "C" {)
- # ifdef _WIN32
- # define EV_CHILD_ENABLE 0
- # else
--# define EV_CHILD_ENABLE EV_FEATURE_WATCHERS
-+# define EV_CHILD_ENABLE 0
- #endif
- #endif
-
-diff -rupN libev-4.15/ev.c libev-4.15-patched/ev.c
---- libev-4.15/ev.c 2013-03-01 03:10:48.000000000 -0800
-+++ libev-4.15-patched/ev.c 2015-03-31 18:32:07.910991755 -0700
-@@ -967,7 +967,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
- #define ecb_unreachable() __builtin_unreachable ()
- #else
- /* this seems to work fine, but gcc always emits a warning for it :/ */
-- ecb_inline void ecb_unreachable (void) ecb_noreturn;
-+ ecb_inline ecb_noreturn void ecb_unreachable (void);
- ecb_inline void ecb_unreachable (void) { }
- #endif
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ba946e5/3rdparty/libprocess/3rdparty/libev-4.15.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/libev-4.15.tar.gz b/3rdparty/libprocess/3rdparty/libev-4.15.tar.gz
deleted file mode 100644
index 4c282b5..0000000
Binary files a/3rdparty/libprocess/3rdparty/libev-4.15.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ba946e5/3rdparty/libprocess/3rdparty/libev-4.22.patch
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/libev-4.22.patch b/3rdparty/libprocess/3rdparty/libev-4.22.patch
new file mode 100644
index 0000000..2d21f9f
--- /dev/null
+++ b/3rdparty/libprocess/3rdparty/libev-4.22.patch
@@ -0,0 +1,12 @@
+diff --git a/ev.h b/ev.h
+index 38f62d8..0055cfd 100644
+--- a/ev.h
++++ b/ev.h
+@@ -125,7 +125,7 @@ EV_CPP(extern "C" {)
+ # ifdef _WIN32
+ # define EV_CHILD_ENABLE 0
+ # else
+-# define EV_CHILD_ENABLE EV_FEATURE_WATCHERS
++# define EV_CHILD_ENABLE 0
+ #endif
+ #endif
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ba946e5/3rdparty/libprocess/3rdparty/libev-4.22.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/libev-4.22.tar.gz b/3rdparty/libprocess/3rdparty/libev-4.22.tar.gz
new file mode 100644
index 0000000..8edfd3f
Binary files /dev/null and b/3rdparty/libprocess/3rdparty/libev-4.22.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/3ba946e5/3rdparty/libprocess/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/versions.am b/3rdparty/libprocess/3rdparty/versions.am
index 7f5a618..2616b2d 100644
--- a/3rdparty/libprocess/3rdparty/versions.am
+++ b/3rdparty/libprocess/3rdparty/versions.am
@@ -6,7 +6,7 @@ BOOST_VERSION = 1.53.0
GLOG_VERSION = 0.3.3
GMOCK_VERSION = 1.7.0
GPERFTOOLS_VERSION = 2.0
-LIBEV_VERSION = 4.15
+LIBEV_VERSION = 4.22
PROTOBUF_VERSION = 2.6.1
HTTP_PARSER_VERSION = 2.6.1
PICOJSON_VERSION = 1.3.0
[2/2] mesos git commit: Upgrade libev to 4.22 to support PowerPC LE
platform [mesos].
Posted by vi...@apache.org.
Upgrade libev to 4.22 to support PowerPC LE platform [mesos].
Review: https://reviews.apache.org/r/45371/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66805e25
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66805e25
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66805e25
Branch: refs/heads/master
Commit: 66805e25e056e046b9d1aa2408c09c1ef91c4f0b
Parents: 3ba946e
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Thu Mar 31 19:33:05 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Mar 31 19:33:05 2016 -0700
----------------------------------------------------------------------
3rdparty/cmake/Versions.cmake | 2 +-
LICENSE | 2 +-
src/python/native_common/ext_modules.py.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/66805e25/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index b89efd5..35d7e98 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -5,7 +5,7 @@ set(GMOCK_VERSION "1.7.0")
set(HTTP_PARSER_VERSION "2.6.1")
set(LEVELDB_VERSION "1.4")
set(LIBAPR_VERSION "1.5.2")
-set(LIBEV_VERSION "4.15")
+set(LIBEV_VERSION "4.22")
# TODO(hausdorff): (MESOS-3529) transition this back to a non-beta version.
set(LIBEVENT_VERSION "2.1.5-beta")
set(PICOJSON_VERSION "1.3.0")
http://git-wip-us.apache.org/repos/asf/mesos/blob/66805e25/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index bbea085..1c0355c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -472,7 +472,7 @@ support library is itself covered by the above license.
======================================================================
-For libev-4.15 (3rdparty/libprocess/3rdparty/libev.tar.gz):
+For libev-4.22 (3rdparty/libprocess/3rdparty/libev-4.22.tar.gz):
======================================================================
All files in libev are
http://git-wip-us.apache.org/repos/asf/mesos/blob/66805e25/src/python/native_common/ext_modules.py.in
----------------------------------------------------------------------
diff --git a/src/python/native_common/ext_modules.py.in b/src/python/native_common/ext_modules.py.in
index 1c2fc49..125b55e 100644
--- a/src/python/native_common/ext_modules.py.in
+++ b/src/python/native_common/ext_modules.py.in
@@ -107,7 +107,7 @@ def _create_module(module_name):
# TODO(hartem): this entire block MUST be removed once libev is deprecated
# in favor of libevent.
if '@ENABLE_LIBEVENT_TRUE@' == '#':
- libev = os.path.join(libprocess, '3rdparty', 'libev-4.15')
+ libev = os.path.join(libprocess, '3rdparty', 'libev-4.22')
libev = os.path.join(abs_top_builddir, libev, '.libs', 'libev.a')
if os.path.exists(libev):