[mesos] branch master updated: Removed bundled libev patch.

[jp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jpeach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b9861e  Removed bundled libev patch.
0b9861e is described below

commit 0b9861e356ec2d7d50163ae54a6be9c1c45f279b
Author: James Peach <jp...@apache.org>
AuthorDate: Fri Sep 21 14:13:29 2018 -0700

    Removed bundled libev patch.
    
    Since we now disable the libev SIGCHLD handler at runtime, we no longer
    need to bundle the patch to do it at build time. It is still useful to
    bundle libev itself, to support older distributions.
    
    Review: https://reviews.apache.org/r/68800/
---
 3rdparty/Makefile.am      |  4 ----
 3rdparty/libev-4.22.patch | 12 ------------
 2 files changed, 16 deletions(-)

diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index a6709ff..d43593e 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -105,10 +105,6 @@ EXTRA_DIST +=		\
 EXTRA_DIST +=		\
   $(LEVELDB).patch
 
-# We patch libev to keep it from reaping child processes.
-EXTRA_DIST +=		\
-  $(LIBEV).patch
-
 # We need to patch ZooKeeper in order to get 3.4.8 to compile on PPC LE.
 EXTRA_DIST +=		\
   $(ZOOKEEPER).patch
diff --git a/3rdparty/libev-4.22.patch b/3rdparty/libev-4.22.patch
deleted file mode 100644
index 2d21f9f..0000000
--- a/3rdparty/libev-4.22.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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