From 40a1f0c214f7aba5e9ade2141ebd9d4a5fe4a9f3 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 26 Oct 2018 15:26:21 +0900 Subject: [PATCH 1/2] event/external: misc configury fixes - Always use the external component when configure'd with --with-libevent=external - Fix the external libevent library version detection by testing _EVENT_NUMERIC_VERSION and EVENT__NUMERIC_VERSION macros - Use the event2/event.h header (event.h is deprecated since libevent 2.0 Signed-off-by: Gilles Gouaillardet (cherry picked from commit 35e77a286c369c1be66ee7ef9ad5ec2faef47edb) --- opal/mca/event/external/configure.m4 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/opal/mca/event/external/configure.m4 b/opal/mca/event/external/configure.m4 index 232f149abb..150ffac97f 100644 --- a/opal/mca/event/external/configure.m4 +++ b/opal/mca/event/external/configure.m4 @@ -58,16 +58,8 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[ OPAL_VAR_SCOPE_PUSH([opal_event_external_CPPFLAGS_save opal_event_external_CFLAGS_save opal_event_external_LDFLAGS_save opal_event_external_LIBS_save opal_event_dir opal_event_summary_msg]) - # Make some processing below easier ($with_libevent==yes and - # $with_libevent==no has already been filtered out). - AS_IF([test "$with_libevent" = "external"], - [with_libevent=]) - opal_event_summary_msg="internal" - # Once we get to this point, $with_libevent is either: blank, a - # directory location, or "internal". - # Check the value of $with_libevent_libdir. This macro safely # handles "yes", "no", blank, and directory name values. OPAL_CHECK_WITHDIR([libevent-libdir], [$with_libevent_libdir], @@ -83,7 +75,7 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[ [opal_event_dir=$with_libevent AC_MSG_RESULT([$opal_event_dir]) OPAL_CHECK_WITHDIR([libevent], [$opal_event_dir], - [include/event.h]) + [include/event2/event.h]) AS_IF([test -z "$with_libevent_libdir" || test "$with_libevent_libdir" = "yes"], [AC_MSG_CHECKING([for $with_libevent/lib64]) AS_IF([test -d "$with_libevent/lib64"], @@ -114,7 +106,7 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[ opal_event_external_LIBS_save=$LIBS OPAL_CHECK_PACKAGE([opal_event_external], - [event.h], + [event2/event.h], [event], [event_config_new], [-levent_pthreads], From 7f36dce3482ca96ebb360818ca20c4aed605c6f3 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 29 Oct 2018 10:07:56 +0900 Subject: [PATCH 2/2] event/external: fix version requirement Only default to the external component if its version is greater or equal than the internal libevent (2.0.22) Signed-off-by: Gilles Gouaillardet (cherry picked from commit b2050392051ed3d9d842f105326f7ea2223aafc4) --- opal/mca/event/external/configure.m4 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/opal/mca/event/external/configure.m4 b/opal/mca/event/external/configure.m4 index 150ffac97f..15313db50a 100644 --- a/opal/mca/event/external/configure.m4 +++ b/opal/mca/event/external/configure.m4 @@ -137,18 +137,20 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[ AS_IF([test "$opal_event_external_support" = "yes"], [AS_IF([test -z "$with_libevent" || test "$with_libevent" = "yes"], - [AC_MSG_CHECKING([if external libevent version is 2.0.21 or greater]) + [AC_MSG_CHECKING([if external libevent version is 2.0.22 or greater]) AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], + [AC_LANG_PROGRAM([[#include ]], [[ -#if _EVENT_NUMERIC_VERSION < 0x02001500 -#error "libevent API version is less than 0x02001500" +#if defined(_EVENT_NUMERIC_VERSION) && _EVENT_NUMERIC_VERSION < 0x02001600 +#error "libevent API version is less than 0x02001600" +#elif defined(EVENT__NUMERIC_VERSION) && EVENT__NUMERIC_VERSION < 0x02001600 +#error "libevent API version is less than 0x02001600" #endif ]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.21)" - AC_MSG_WARN([external libevent version is less than internal version (2.0.21)]) + opal_event_summary_msg="internal (external libevent version is less that internal version 2.0.22)" + AC_MSG_WARN([external libevent version is less than internal version (2.0.22)]) AC_MSG_WARN([using internal libevent]) opal_event_external_support=no])])])