You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2018/10/04 13:47:37 UTC
[mesos] 05/08: Updated libevent linkage to adhere to best practices.
This is an automated email from the ASF dual-hosted git repository.
tillt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 2ccc37e97f420e4378985f06673295305a4e60d0
Author: Till Toenshoff <to...@me.com>
AuthorDate: Thu Oct 4 15:41:19 2018 +0200
Updated libevent linkage to adhere to best practices.
libevent is a combination of libevent_core and libevent_extra. Mesos
and libprocess do not make use of any libevent_extra functionality.
Additionally, linking against libevent is against best practices.
Replaces use of libevent with libevent_core in both libevent.m4 as
well as the libprocess linkage.
Review: https://reviews.apache.org/r/68914/
---
3rdparty/libprocess/Makefile.am | 3 +--
3rdparty/libprocess/m4/libevent.m4 | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index 22b1395..851a842 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -158,8 +158,7 @@ endif
else
if WITH_BUNDLED_LIBEVENT
LIB_EVENT_INCLUDE_FLAGS = -I$(LIBEVENT)
-LIB_EVENT = $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_pthreads.la \
- $(LIBEVENT)/libevent_extra.la $(LIBEVENT)/libevent.la
+LIB_EVENT = $(LIBEVENT)/libevent_core.la $(LIBEVENT)/libevent_pthreads.la
if ENABLE_SSL
LIB_EVENT += $(LIBEVENT)/libevent_openssl.la
endif
diff --git a/3rdparty/libprocess/m4/libevent.m4 b/3rdparty/libprocess/m4/libevent.m4
index cd52b3f..35242a1 100644
--- a/3rdparty/libprocess/m4/libevent.m4
+++ b/3rdparty/libprocess/m4/libevent.m4
@@ -33,10 +33,10 @@ libevent version 2+ headers are required for libprocess to build.
-------------------------------------------------------------------
])])
- AC_CHECK_LIB([event], [event_base_new], [], [
+ AC_CHECK_LIB([event_core], [event_base_new], [], [
AC_MSG_ERROR([cannot find libevent
-------------------------------------------------------------------
-libevent version 2+ is required for libprocess to build.
+libevent_core version 2+ is required for libprocess to build.
-------------------------------------------------------------------
])])